Timothy Teakettle
4e6146898c
fixes/config edits
2020-10-26 20:27:58 +00:00
Timothy Teakettle
2b00f2bb2f
config values
2020-10-26 20:27:02 +00:00
Timothy Teakettle
38313fa362
i hate dwarves
2020-10-26 17:50:21 +00:00
Timothy Teakettle
cfefe99d35
okay so what if its not quirks
2020-10-26 17:45:43 +00:00
timothyteakettle
e35b3e4a33
color editing
2020-10-26 00:47:40 +00:00
timothyteakettle
926b63ba06
stop using double spaces
2020-10-25 22:54:53 +00:00
Timothy Teakettle
0c2e1997ce
more loadout 2
2020-10-25 22:49:39 +00:00
Ghommie
444a440fba
oh
2020-10-25 15:38:36 +01:00
Ghommie
f49f72338f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841
2020-10-25 15:01:57 +01:00
Ghommie
90c4cb2022
Here I fix a few issues.
2020-10-25 14:50:42 +01:00
Delams-The-SM
52abbbf247
Fixes matrix color radomisation in /proc/randomize_human ( #13599 )
2020-10-25 13:07:46 +01:00
zeroisthebiggay
626fcf0aeb
OOPS
...
FUCK
2020-10-25 05:36:59 -04:00
zeroisthebiggay
2c278ba370
A
...
A
2020-10-25 05:34:53 -04:00
zeroisthebiggay
5eec2b76f5
OK MAYBE NOT INDESTRUCTIBLE
...
OK
2020-10-25 05:34:24 -04:00
zerothebigboy
6577aaac91
FRUSTRATION
2020-10-25 05:30:06 -04:00
Letter N
3d2bd4a98e
Revert "removes dildo"
2020-10-25 12:55:04 +08:00
timothyteakettle
71134ed8c3
better loadout flags
2020-10-25 01:08:35 +00: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
Trilbyspaceclone
bb155f8784
Apply suggestions from code review
...
Grammar
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com >
2020-10-24 07:25:27 -04:00
timothyteakettle
a39dea1b4d
json loadout
2020-10-24 00:31:45 +01:00
Timothy Teakettle
78d8e1fcee
debug
2020-10-23 22:03:21 +01:00
Vynzill
ff6850b9b0
jungle gateway map
2020-10-23 15:11:27 -05:00
Timothy Teakettle
f17bf787e7
render antennas
2020-10-23 20:19:25 +01:00
Ghom
5d0e26e9a1
Quick clown/mime masks designs fix.
2020-10-23 18:08:54 +02: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
Vynzill
5f75151c51
junglemap
2020-10-21 17:00:28 -05:00
Timothy Teakettle
06bbddd248
Update preferences_savefile.dm
2020-10-21 18:20:14 +01:00
Trilbyspaceclone
76a046b97a
Update clothesmate.dm
2020-10-21 11:39:49 -04:00
Timothy Teakettle
ab35f8cf66
include literally everything
2020-10-21 15:47:42 +01:00
Trilby
8fa595ccea
Makes welder code better*
2020-10-21 05:50:41 -04:00
timothyteakettle
049f153cbf
works but looks weird
2020-10-21 00:55:02 +01:00
kappa-sama
b3fc60c3f5
this too
2020-10-20 19:44:10 -04:00
kappa-sama
aa696edd84
this
2020-10-20 19:39:23 -04:00
timothyteakettle
2166bdac79
okay this aint going well
2020-10-21 00:11:40 +01:00
Timothy Teakettle
e6895bec04
better loadout
2020-10-20 21:02:17 +01:00
Timothy Teakettle
36040e0689
Revert "better taurs"
...
This reverts commit c649dbe6c6 .
2020-10-20 20:05:16 +01:00
Putnam
7789aeeefc
Made minor starts affect full round less; added fallback
2020-10-19 20:28:56 -07:00
Putnam
1738233c27
Adds a new "minor antag" roundtype to dynamic
...
with an associated storyteller, even
2020-10-19 20:20:51 -07:00
Timothy Teakettle
4afceebcc1
critical
2020-10-20 02:11:08 +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