Commit Graph

25628 Commits

Author SHA1 Message Date
Timothy Teakettle
022f996cfa better fix 2020-11-05 17:28:32 +00:00
timothyteakettle
8126eb5a12 fixes a lot of things 2020-11-02 23:07:27 +00:00
timothyteakettle
f34882cf60 Update preferences_savefile.dm 2020-11-01 23:27:34 +00:00
timothyteakettle
ede19dd47d Update preferences_savefile.dm 2020-11-01 23:25:09 +00:00
Timothy Teakettle
22823f629d an actual fix 2020-11-01 20:40:08 +00:00
Timothy Teakettle
e78383f4fa typo 2020-10-30 19:42:02 +00:00
Timothy Teakettle
f4f322dd0e better fix 2020-10-30 19:39:43 +00:00
timothyteakettle
cf49e78d45 Merge remote-tracking branch 'upstream/master' into i-hate-mcolor 2020-10-27 22:12:55 +00:00
timothyteakettle
a987420d22 fix for mam markings 2020-10-27 21:40:07 +00:00
timothyteakettle
a9f2b86da9 tonne of fixes 2020-10-27 21:32:08 +00:00
Delams-The-SM
52abbbf247 Fixes matrix color radomisation in /proc/randomize_human (#13599) 2020-10-25 13:07:46 +01:00
Arturlang
d3616f2d17 Fixes hijack UI (#13598)
* Fixes hijack UI

* This was lost too it seems

* And this

* More stuff that was removed

* Should be good now

* Nice and proper now
2020-10-24 21:23:52 +02:00
silicons
585208dda9 Update angel.dm (#13621) 2020-10-24 21:22:32 +02:00
silicons
3293715025 Update items.dm (#13622) 2020-10-24 21:22:01 +02:00
Timothy Teakettle
f17bf787e7 render antennas 2020-10-23 20:19:25 +01:00
Timothy Teakettle
f778ec0199 yeah lets maybe render stuff 2020-10-22 01:33:53 +01:00
timothyteakettle
a9a4d00171 second qol 2020-10-22 00:08:33 +01:00
timothyteakettle
20854dd639 extra qol 2020-10-22 00:01:41 +01:00
timothyteakettle
4a3afae9d1 WHAT IF WE FIXED EVERYTHING IN ONE COMMIT 2020-10-21 23:59:15 +01:00
silicons
231c5f0a9d Merge pull request #13581 from Ghommie/Ghommie-cit840
mime/clown masks' face concealment toggleable with altclick. Plasmaman helmet welding visor & smiley port.
2020-10-21 15:43:09 -07:00
Timothy Teakettle
06bbddd248 Update preferences_savefile.dm 2020-10-21 18:20:14 +01:00
Timothy Teakettle
ab35f8cf66 include literally everything 2020-10-21 15:47:42 +01:00
Putnam3145
c934e6ca25 Merge pull request #13565 from Citadel-Station-13/silicons-patch-22
adds empty() proc to pipelines that purges all connected airs to avoid sdql2 and proccall torture (SPT) whenever atmos breaks and the station is -#1.IND degrees hot
2020-10-19 14:31:40 -07:00
silicons
b38f9e982e Update code/modules/atmospherics/machinery/datum_pipeline.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2020-10-19 14:17:23 -07:00
BlueWildrose
86d15d8fb3 Fixed species-specific drinks not giving a mood boost if right species (#13585)
* Species drink moodboost fix

* code cleanup

* Revert "code cleanup"

This reverts commit fa308a2acd213b085308ebf3595d08463cbcd7be.

* code cleanup

* meant to make this 26 not 30

* Committing Putnam's suggestion

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2020-10-19 11:46:36 +02:00
Putnam3145
ac823ae29b Merge pull request #13583 from Citadel-Station-13/silicons-patch-1
fixes squeak components reacting to cross rather than crossed
2020-10-18 22:45:59 -07:00
Putnam3145
0f56a97dd0 Merge pull request #13589 from timothyteakettle/funny-implanter
autosurgeons from the travelling trader have uses set to 1 instead of INFINITY
2020-10-18 22:45:32 -07:00
Timothy Teakettle
f5cc216a4c travis segfaulted 2020-10-18 21:51:58 +01:00
Timothy Teakettle
c53eeff33f travis segfaulted 2020-10-18 21:51:36 +01:00
Timothy Teakettle
f965b78960 remove debug messages 2020-10-18 21:36:51 +01:00
Timothy Teakettle
8e2345d2f7 FUCK 2020-10-18 21:36:17 +01:00
Timothy Teakettle
2ac3bbbaf3 fix 2020-10-18 21:09:20 +01:00
Timothy Teakettle
bb46fa319c fix 2020-10-18 18:34:07 +01:00
Timothy Teakettle
bfb3546ccc save/load 2020-10-18 18:16:29 +01:00
Timothy Teakettle
40efc4b8c8 cleanup and migration fix 2020-10-18 18:05:59 +01:00
Timothy Teakettle
861f225f2d trader fix 2020-10-18 03:25:17 +01:00
Timothy Teakettle
87387f45d1 fixes 2020-10-17 23:32:08 +01:00
Timothy Teakettle
5e780064c1 fixes and a toggle 2020-10-17 19:47:46 +01:00
silicons
44dc292101 Update preferences_savefile.dm (#13557) 2020-10-17 13:58:33 +02:00
Zandario
fcd8fec815 Fixes an oversight and updates some defines (#13558) 2020-10-17 12:37:58 +02:00
Putnam3145
f6b93a242c Makes get_damaged_bodyparts use proper arguments (#13570)
* you're not being clever, you're being obfuscatory, stop this

* Made get_damaged_bodyparts use proper arguments

* Actually shouldn't have the arg
2020-10-17 11:44:15 +02:00
DeltaFire15
ca21572aa7 Fixes vamp shapeshifting a bit (#13562)
* fixes vamp shapeshifting a bit

Title. Buncha weird stuff happening.

* ghom's request

moves the check to ../bat/cast(), adds type safety
2020-10-17 11:39:58 +02:00
MrJWhit
4fdacf0560 Porting putnams ventcrawling PR and Fix (#13571)
* Porting putnams rage

* And the bugfix
2020-10-17 11:39:25 +02:00
silicons
f16343d726 Update squeak.dm 2020-10-16 20:48:11 -07:00
timothyteakettle
04e1d9fc39 more fixes 2020-10-17 03:42:14 +01:00
timothyteakettle
d5a1834788 more fixes 2020-10-17 01:40:02 +01:00
timothyteakettle
4f5465c39e fixes 2020-10-17 01:00:04 +01:00
Timothy Teakettle
2c6e8fd87d what if color was cool 2020-10-16 22:28:00 +01:00
Putnam3145
099a82b936 Made fermichem displays work correctly. (#13577) 2020-10-16 22:27:37 +02:00
Ghom
b893e40494 Update gasmask.dm 2020-10-16 20:57:08 +02:00