silicons
|
a60f801f69
|
e
|
2021-05-12 04:23:53 -07:00 |
|
silicons
|
5601badbff
|
deterministic explosion system (#13392)
* wae explosions
* okay
* changes
* fixes
* fix
* ok
* ok
* kills more dead code
* okay
* fix
* ok
* tiles
* ok
* okay
* woops
* ok
* fix
* okay
* mob damage
* fixes
* insanity
* more
* more
* fixes
* more
* woot
* don't commit that
* YES
* fix
|
2021-05-12 05:44:53 -05:00 |
|
silicons
|
2d455e4da2
|
Merge pull request #14710 from Linzolle/anthro
Anthromorphic isnt a word
|
2021-05-12 04:42:28 -06:00 |
|
silicons
|
c5f13c44a8
|
Merge pull request #14708 from qweq12yt/misc-fixes
[Fix] Bugs are BAD!
|
2021-05-12 04:42:22 -06:00 |
|
silicons
|
3b1d66efc5
|
Merge pull request #14702 from zeroisthebiggay/fineilldooitmyself
bunny ears but they're not lops (vegas style)
|
2021-05-12 04:42:12 -06:00 |
|
Linzolle
|
4609d732f9
|
more spellcheck of anthropomorph
|
2021-05-10 17:15:43 -05:00 |
|
Lin
|
59914250c3
|
spellcheck
|
2021-05-10 17:04:48 -05:00 |
|
Lin
|
19d6ff8371
|
Merge pull request #14703 from LetterN/fixes-syndie-shit
balances syndie simplemob
|
2021-05-10 14:29:48 -05:00 |
|
qweq12yt
|
8c0911e968
|
fix hulks breaking cuffs/zipties
|
2021-05-10 15:56:50 -03:00 |
|
Timothy Teakettle
|
be9b1ddffb
|
fixes
|
2021-05-10 14:43:45 +01:00 |
|
Timothy Teakettle
|
6095b4724f
|
fixes fox markings legs
|
2021-05-10 01:54:24 +01:00 |
|
keronshb
|
cda492c6ba
|
Removes the condition if they're knocked down
|
2021-05-09 20:10:38 -04:00 |
|
zerothebigboy
|
315e4fcdaa
|
look at this dude
|
2021-05-09 19:28:07 -04:00 |
|
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 |
|
silicons
|
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 |
|
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 |
|
silicons
|
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 |
|
silicons
|
7c1358a39d
|
Merge pull request #14642 from SandPoot/tgui-select-equipment-menu
TGUI Select Equipment menu
|
2021-04-25 17:10:09 -06:00 |
|
DrPainis
|
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 |
|
WanderingFox95
|
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 |
|