shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,322 Commits 5 Branches 0 Tags
ecc99f6daa708ea768390ee2968562fe979de111
Commit Graph
25721 Commits
Author SHA1 Message Date
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-SMandGitHub 52abbbf247 Fixes matrix color radomisation in /proc/randomize_human (#13599) 2020-10-25 13:07:46 +01:00
zeroisthebiggayandGitHub 626fcf0aeb OOPS 
FUCK
 2020-10-25 05:36:59 -04:00
zeroisthebiggayandGitHub 2c278ba370 A 
A
 2020-10-25 05:34:53 -04:00
zeroisthebiggayandGitHub 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 NandGitHub 3d2bd4a98e Revert "removes dildo" 2020-10-25 12:55:04 +08:00
ArturlangandGitHub 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
siliconsandGitHub 585208dda9 Update angel.dm (#13621) 2020-10-24 21:22:32 +02:00
siliconsandGitHub 3293715025 Update items.dm (#13622) 2020-10-24 21:22:01 +02:00
TrilbyspacecloneGitHubjjpark-kb
 		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
Vynzill ff6850b9b0 jungle gateway map 2020-10-23 15:11:27 -05:00
GhomandGitHub 5d0e26e9a1 Quick clown/mime masks designs fix. 2020-10-23 18:08:54 +02:00
siliconsandGitHub 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
TrilbyspacecloneandGitHub 76a046b97a Update clothesmate.dm 2020-10-21 11:39:49 -04: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-samaandGitHub b3fc60c3f5 this too 2020-10-20 19:44:10 -04:00
kappa-samaandGitHub aa696edd84 this 2020-10-20 19:39:23 -04: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
Putnam3145andGitHub 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
siliconsGitHubPutnam3145
 		b38f9e982e Update code/modules/atmospherics/machinery/datum_pipeline.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-19 14:17:23 -07:00
BlueWildroseGitHubPutnam3145
 		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
Putnam3145andGitHub 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
Putnam3145andGitHub 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
Putnam 558d11bc73 Stringified the vote #defines for easier config stuff 2020-10-18 14:49:43 -07:00
Putnam 07a02617c2 Fixed compiler errors, runtimes 2020-10-18 12:51:00 -07:00
Putnam 00b4d207c5 Added ranked choice ballots to stat voting. 2020-10-18 12:32:45 -07:00
Timothy Teakettle 861f225f2d trader fix 2020-10-18 03:25:17 +01:00
siliconsandGitHub 44dc292101 Update preferences_savefile.dm (#13557) 2020-10-17 13:58:33 +02:00
ZandarioandGitHub fcd8fec815 Fixes an oversight and updates some defines (#13558) 2020-10-17 12:37:58 +02:00
Putnam3145andGitHub 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
DeltaFire15andGitHub 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
MrJWhitandGitHub 4fdacf0560 Porting putnams ventcrawling PR and Fix (#13571) 
* Porting putnams rage

* And the bugfix
 2020-10-17 11:39:25 +02:00
siliconsandGitHub f16343d726 Update squeak.dm 2020-10-16 20:48:11 -07:00
Putnam3145andGitHub 099a82b936 Made fermichem displays work correctly. (#13577) 2020-10-16 22:27:37 +02:00
GhomandGitHub b893e40494 Update gasmask.dm 2020-10-16 20:57:08 +02:00
Ghommie c0f3317c01 mime/clown masks' face concealment altclick toggle. Plasmaman helmets' welding visors & smileys port. 2020-10-16 20:27:09 +02:00
BlueWildroseandGitHub a134bedd4c Fixes subtle hotkey, adds subtler hotkey (#13575) 2020-10-16 17:22:35 +02:00
Putnam f0d5c65ef1 Removes the surgery unit test so travis stops randomly failing. 2020-10-15 11:54:03 -07:00
siliconsGitHubGhom
 		c3cdeb0507 fixes movespeed configurations (#13555) 
* Update config_entry.dm

* Update game_options.dm

* Update config_entry.dm

* Update code/controllers/configuration/config_entry.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-10-15 13:53:21 +02:00
Putnam3145andGitHub bcf697e8d7 Fixes a race condition in the surgery unit test that causes it to fail at random (#13552) 
* Fixes a race condition in the surgery unit test

* Increases the sleep a bit.
 2020-10-15 13:38:49 +02:00
VynzillandGitHub cbe9f6c12a makes eyes glow once again with high luminosity (#13554) 2020-10-15 13:37:09 +02:00
BlueWildroseandGitHub 6080253759 Fixes cloning computer UI not updating when pressing certain buttons - also adds extra check for names to update a message (#13549) 
* fixes cloning computer UI not updating when pressing certain buttons

* forgot a few things
 2020-10-15 12:54:22 +02:00
DeltaFire15GitHubGhom
 		1e1a92983a [s] Objective fixes : Cryo edition (#13561) 
* no more free wins from cryo

* Kicks travis with an empty commit

* Update code/game/gamemodes/objective.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-10-15 12:44:08 +02:00