 zerothebigboy
|
d2dbd7572b
|
cyborgs and runtime fixes
|
2021-05-09 19:09:58 -04:00 |
|
|
LetterN
|
2bf221be4f
|
fixes syndie simplemob
|
2021-05-09 21:35:15 +08:00 |
|
|
zerothebigboy
|
181dcc347b
|
cum sex balls penis
|
2021-05-09 04:34:25 -04:00 |
|
|
siliconsandGitHub
|
633591b81e
|
Merge pull request #14688 from SandPoot/good-tooltips
Makes tooltips good and creates a base for adding more.
|
2021-05-07 18:41:22 -06:00 |
|
|
Timothy Teakettle
|
5bc33c222a
|
Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two
|
2021-05-08 01:28:23 +01:00 |
|
|
timothyteakettle
|
bef9473fa1
|
more migration fixes and general bugfixes
|
2021-05-07 16:10:20 +01:00 |
|
|
timothyteakettle
|
b1f84f94db
|
Update body_markings.dm
|
2021-05-06 22:43:31 +01:00 |
|
|
timothyteakettle
|
80599201cf
|
better fix
|
2021-05-06 22:39:07 +01:00 |
|
|
timothyteakettle
|
cb12843a34
|
bugfix
|
2021-05-06 22:35:15 +01:00 |
|
|
keronshb
|
7947258e51
|
Off balance disarm
If it hits a wall or a person while under the effect of off balance.
|
2021-05-05 23:57:01 -04:00 |
|
|
SandPoot
|
9cf04467a7
|
upload files
|
2021-05-05 17:55:30 -03:00 |
|
|
Timothy Teakettle
|
d39a60dd6b
|
casually list the matrixes for several hundred sprites
|
2021-05-05 21:24:07 +01:00 |
|
|
Artur
|
8a3dd8515e
|
fixes bleeding properly
|
2021-05-05 21:42:14 +03:00 |
|
|
Artur
|
cc59e2c225
|
feedback changes
|
2021-05-05 20:40:52 +03:00 |
|
|
Timothy Teakettle
|
ea071bd031
|
comment
|
2021-05-05 18:28:55 +01:00 |
|
|
Timothy Teakettle
|
ba71bb944a
|
im not crazy but this commit breaks 90% of the game
|
2021-05-05 18:11:05 +01:00 |
|
|
Fabian
|
63d910c79c
|
Merge branch 'master' into the-fuck-am-i-doing
|
2021-05-05 17:26:41 +02:00 |
|
|
Artur
|
35bfba1f6a
|
Redoes the variable changes into procs
|
2021-05-05 18:15:13 +03:00 |
|
|
Artur
|
28205f9dce
|
More fixes to make it work
|
2021-05-05 17:41:37 +03:00 |
|
|
Artur
|
d9f6e51bc8
|
making it actually work properly
|
2021-05-05 15:26:20 +03:00 |
|
|
Artur
|
92e6646a4c
|
time to make blood even more pain
|
2021-05-05 14:44:21 +03:00 |
|
|
keronshb
|
be2e962983
|
Off Balance for Guns only again
Was intended for guns
|
2021-05-04 00:51:16 -04:00 |
|
|
timothyteakettle
|
7265c7111c
|
new limb covering var for markings
|
2021-05-03 22:47:22 +01:00 |
|
|
zerothebigboy
|
359c778955
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
# code/modules/ninja/suit/ninjaDrainAct.dm
|
2021-05-02 22:47:39 -04:00 |
|
|
Timothy Teakettle
|
93254f5d9c
|
Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two
|
2021-05-02 22:20:57 +01:00 |
|
|
Timothy Teakettle
|
ac504d679b
|
digi humans
|
2021-04-30 14:07:44 +01:00 |
|
|
siliconsandGitHub
|
17d7c4dd9a
|
Merge pull request #14659 from DrPainis/patch-12
Bubblegum HALLUCINATIONS are capitalized
|
2021-04-28 21:17:15 -06:00 |
|
|
timothyteakettle
|
2f5cb63994
|
who deleted this
|
2021-04-28 17:37:09 +01:00 |
|
|
silicons
|
47489c21d6
|
Merge remote-tracking branch 'citadel/master' into auxtools-atmos
|
2021-04-27 00:59:45 -07:00 |
|
|
silicons
|
1585d1c2be
|
fixes
|
2021-04-26 23:32:33 -07:00 |
|
|
silicons
|
a415453540
|
ripping off my own code
|
2021-04-26 23:29:37 -07:00 |
|
|
silicons
|
eb2c12ceee
|
yell wip
|
2021-04-26 23:10:10 -07:00 |
|
|
silicons
|
8fe45263c5
|
whew
|
2021-04-26 22:58:30 -07:00 |
|
|
silicons
|
275b532a8c
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-04-26 14:17:43 -07:00 |
|
|
siliconsandGitHub
|
7c1358a39d
|
Merge pull request #14642 from SandPoot/tgui-select-equipment-menu
TGUI Select Equipment menu
|
2021-04-25 17:10:09 -06:00 |
|
|
DrPainisandGitHub
|
e313fed033
|
hallucinations are capitalized too
|
2021-04-25 19:04:07 -04:00 |
|
|
Timothy Teakettle
|
f243c6b7c4
|
makes them apply properly
|
2021-04-25 13:23:16 +01:00 |
|
|
WanderingFox95andGitHub
|
ace2f522fb
|
No more Suicidal Parrots! (Ready) (#14628)
* Modifies Parrots
They spawn from hostile triggers, not as friendly pets now.
* Removes Parrots from Gold Extracts altogether
|
2021-04-24 21:47:04 +02:00 |
|
|
DrPainisandGitHub
|
7d6cb67c91
|
literally just changes one letter (#14634)
|
2021-04-24 21:40:41 +02:00 |
|
|
Timothy Teakettle
|
869124bb50
|
markings
|
2021-04-24 15:56:57 +01:00 |
|
|
SandPoot
|
5bb6078def
|
upload files
|
2021-04-22 20:39:21 -03:00 |
|
|
siliconsandGitHub
|
75e3f5eae6
|
Merge pull request #14573 from zeroisthebiggay/eatshitanddie
pov: you're an enraged miner main that hates having their loot require a modicum of effort (ports tg ash drake)
|
2021-04-21 13:50:46 -06:00 |
|
|
DrPainisandGitHub
|
ac96276f8e
|
literally just changes one letter
|
2021-04-20 16:20:44 -04:00 |
|
|
siliconsandGitHub
|
f0c2188c5f
|
Merge pull request #14443 from necromanceranne/baton_change_pr
Another dreaded baton rework pr; batons knockdown and slow on rightclick (with a cooldown), otherwise stagger, plus more
|
2021-04-20 05:52:59 -06:00 |
|
|
siliconsandGitHub
|
74280ed082
|
Merge pull request #14582 from BlueWildrose/slimeorgans
Slimeperson organs are now unique with a unique name, therefore confusing people
|
2021-04-18 19:02:53 -06:00 |
|
|
siliconsandGitHub
|
af7bb2e09f
|
Merge pull request #14585 from zeroisthebiggay/cumbblegum
pov: you're watching zero ruin megafauna by making them DDR raves one pr at a time (ports epic tg bubblegum)
|
2021-04-18 19:00:14 -06:00 |
|
|
necromanceranneandGitHub
|
75e0e893a2
|
Merge branch 'master' into baton_change_pr
|
2021-04-19 10:55:33 +10:00 |
|
|
siliconsandGitHub
|
9c780f7672
|
Merge pull request #14624 from DrPainis/patch-9
adds ash drake meat
|
2021-04-18 18:51:34 -06:00 |
|
|
siliconsandGitHub
|
e8e625cb5c
|
Merge pull request #14603 from Putnam3145/fix-base-option
Activity tracking; traitor class tweaks
|
2021-04-18 18:49:27 -06:00 |
|
|
siliconsandGitHub
|
02f4bd8f3a
|
Merge pull request #14591 from zeroisthebiggay/deathrattles
ports deathrattle implants but without mob statchange because i am not gonna port that today
|
2021-04-18 18:48:08 -06:00 |
|