Putnam3145
|
6b8f9427d0
|
Merge pull request #10153 from Linzolle/fireman-clarity
make unable to carry fireman message more clear when unable to carry non-humans
|
2019-12-17 12:09:08 -08:00 |
|
Putnam3145
|
b8c5290011
|
Merge pull request #10026 from Linzolle/neck-slice
Neck slice
|
2019-12-17 11:58:00 -08:00 |
|
Putnam3145
|
ed44b3130c
|
Merge pull request #10172 from Ghommie/Ghommie-cit460
Porting several quirks code updates.
|
2019-12-17 11:51:03 -08:00 |
|
Putnam3145
|
7017ab243b
|
Merge pull request #10216 from Ghommie/Ghommie-cit474
Porting a few martial art code updates.
|
2019-12-17 11:47:19 -08:00 |
|
Putnam3145
|
7a6541936c
|
Merge pull request #10111 from kappa-sama/patch-11
send help please, or how i vowed to kill kevinz (you can now strip people while aggrograbbing)
|
2019-12-17 11:38:35 -08:00 |
|
Ghommie
|
f2cf146255
|
Two slimepeople fixes.
|
2019-12-17 12:49:04 +01:00 |
|
Ghommie
|
6b7dcbceb0
|
Porting a few martial art code updates.
|
2019-12-17 03:19:07 +01:00 |
|
Useroth
|
8151a1f3ff
|
Merged master into this branch.
|
2019-12-16 12:06:30 +01:00 |
|
Putnam3145
|
c39a5d0462
|
Merge pull request #10011 from Arturlang/Bloodsuckers
Bloodsuckers, or, yknow, vampires.
|
2019-12-15 14:41:36 -08:00 |
|
kappa-sama
|
f8a05b5ae1
|
perhaps
|
2019-12-15 17:31:49 -05:00 |
|
Ghommie
|
b39ae815f3
|
Porting several quirks code updates.
|
2019-12-13 16:12:04 +01:00 |
|
BlackMajor
|
725414bd03
|
Merge pull request #9894 from Putnam3145/real-explosion-fix
[TESTMERGE] Explosion/bomb armor rework
|
2019-12-13 10:20:33 +13:00 |
|
Ghommie
|
3545f10137
|
Fixing character setup preview icons.
|
2019-12-12 17:04:14 +01:00 |
|
Linzolle
|
acffa683c9
|
clearer message?
|
2019-12-12 00:40:08 -06:00 |
|
kappa-sama
|
b89d04884e
|
indents oops
|
2019-12-11 17:23:00 -05:00 |
|
kappa-sama
|
2b8f81bca3
|
idk maybe
|
2019-12-11 17:22:14 -05:00 |
|
kappa-sama
|
be3439e461
|
idk maybe?
|
2019-12-11 16:57:06 -05:00 |
|
Putnam3145
|
beddaa1a99
|
Merge pull request #10053 from Ghommie/Ghommie-cit429
Fixes some means of eyes blindness not working, removes legacy code.
|
2019-12-09 12:40:37 -08:00 |
|
Artur
|
9773b530f8
|
More fixes. Urgh
|
2019-12-08 21:47:25 +02:00 |
|
Useroth
|
a37f2de71d
|
First step of porting lavaland tumors. Looks like Cita is much behind tg regarding simplemobs.
|
2019-12-08 14:00:08 +01:00 |
|
kappa-sama
|
cdda28f85c
|
tabs
|
2019-12-08 03:54:55 -05:00 |
|
kappa-sama
|
48be47d4d1
|
yes?
|
2019-12-08 03:54:29 -05:00 |
|
kappa-sama
|
52a050e9ee
|
maybe
|
2019-12-08 03:54:02 -05:00 |
|
kappa-sama
|
b015d2571a
|
==?
|
2019-12-08 03:51:36 -05:00 |
|
kappa-sama
|
10c844e70d
|
does this even work
|
2019-12-08 03:36:09 -05:00 |
|
Lin
|
24e4673c2b
|
Merge pull request #10057 from Ghommie/Ghommie-cit431
fixes on_mob eyes overlays not updating properly in certain cases.
|
2019-12-07 21:49:18 +00:00 |
|
Artur
|
4711eb0987
|
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
|
2019-12-07 15:53:11 +02:00 |
|
Putnam3145
|
6b2d3b116d
|
Merge branch 'master' into Ghommie-cit430
|
2019-12-05 20:53:14 -08:00 |
|
kevinz000
|
54be35a243
|
Merge pull request #9997 from Sishen1542/nuked
removes superspeed from nuka cola
|
2019-12-05 21:48:34 -07:00 |
|
kevinz000
|
5048995a58
|
Merge pull request #9993 from Ghommie/Ghommie-cit412
Ports tgstation loom changes, and durathred golems.
|
2019-12-05 21:44:25 -07:00 |
|
Ghommie
|
d6fe78f4a7
|
fixes on_mob eyes overlays not updating properly sometimes.
|
2019-12-06 03:38:39 +01:00 |
|
Ghommie
|
9ca7bb759c
|
Ports "Slightly improves visible and audible messages."
|
2019-12-06 02:02:12 +01:00 |
|
Ghommie
|
238655d599
|
Fixes eyes blindness a little.
|
2019-12-06 00:10:50 +01:00 |
|
Artur
|
af4eaf7f0f
|
Fixeesss
|
2019-12-03 23:09:11 +02:00 |
|
Ghommie
|
3c7d2972de
|
Porting some return type annotations and bad keyword fixes, linter stuff.
|
2019-12-03 03:31:35 +01:00 |
|
Artur
|
90113838a7
|
Iconfix and co
Traits instead of procs for fakedeath
Quickfix
Whoops this too
Loadsa fixes
Nerfs stamina regen
Too slow
Hm
|
2019-12-02 19:48:02 +02:00 |
|
Linzolle
|
f4318c9dba
|
bleeding indicator for more than jsut heparin
|
2019-12-01 18:10:48 -06:00 |
|
Artur
|
f48d8016d5
|
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
|
2019-12-01 13:51:57 +02:00 |
|
Putnam3145
|
e1a9c8e6d3
|
Merge pull request #9972 from Ghommie/Ghommie-cit403
Fixed double whitespace gap in human, ai and carbon examine.
|
2019-11-30 22:46:29 -08:00 |
|
Artur
|
02048ce009
|
Bludsuckers
|
2019-11-29 21:28:14 +02:00 |
|
Sishen
|
69e11e4203
|
olllll
|
2019-11-28 23:01:15 -07:00 |
|
Sishen
|
3a1e4dec5a
|
Revert "lol"
This reverts commit 7f6a1a6fda.
|
2019-11-28 23:00:13 -07:00 |
|
Sishen
|
7f6a1a6fda
|
lol
|
2019-11-28 22:53:39 -07:00 |
|
Ghommie
|
2bd4ac5de8
|
Also AI and Carbon
|
2019-11-29 06:31:23 +01:00 |
|
Ghommie
|
e6484a22a8
|
Ports tgstation loom changes, and durathred golems.
|
2019-11-29 05:34:17 +01:00 |
|
Ghommie
|
b66832809e
|
Fixing that tiny gap in human examine.
|
2019-11-28 04:37:16 +01:00 |
|
Ghommie
|
d1d201ff26
|
Sanity check.
|
2019-11-27 06:39:09 +01:00 |
|
Ghommie
|
d43d996c38
|
ouch
|
2019-11-27 06:19:17 +01:00 |
|
Ghommie
|
c67f138d23
|
patching some combat mode edge cases and issues.
|
2019-11-27 06:10:08 +01:00 |
|
kevinz000
|
ccfdb74508
|
Merge pull request #9882 from FestiveBall/Fersi
[READY] Allows addition of reagents to sleepers for injection and detection of failed organs (minor GUI tweak.)
|
2019-11-26 16:02:42 -07:00 |
|