shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,138 Commits 5 Branches 0 Tags
598c2fab2b00a8dca4642a4054ca09fba21fe128
Commit Graph

25613 Commits

Author SHA1 Message Date
silicons
598c2fab2b Merge pull request #13616 from Citadel-Station-13/Ghommie-patch-1 
Quick clown/mime masks designs fix.
 2020-10-28 07:49:38 -07:00
silicons
5c53a2cbe2 Merge pull request #13607 from timothyteakettle/polychrome-maid 
polychromic maid outfit
 2020-10-28 07:46:55 -07:00
silicons
f2747a3b1c Merge pull request #13605 from Trilbyspaceclone/patch-403 
Adds corporate uniforms to the clothing vender
 2020-10-28 07:46:24 -07:00
silicons
1a1b6af819 Merge pull request #13603 from kappa-sama/patch-43 
controversial shotgun buff (very scary)
 2020-10-28 07:44:02 -07:00
silicons
6d2028abb5 Merge pull request #13601 from timothyteakettle/critical-item 
antagonistic items will no longer fail to be placed on you
 2020-10-28 07:43:39 -07:00
silicons
e672ee847e Merge pull request #13592 from Putnam3145/stat-voting-tweaks 
Adds ranked choice ballots to stat voting
 2020-10-28 07:41:43 -07:00
silicons
a3228b3366 Merge pull request #13593 from Putnam3145/add-all-vote-types-to-maps 
Stringified the vote #defines for easier config stuff
 2020-10-28 07:41:35 -07: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
Ghom
5d0e26e9a1 Quick clown/mime masks designs fix. 2020-10-23 18:08:54 +02: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
Trilbyspaceclone
76a046b97a Update clothesmate.dm 2020-10-21 11:39:49 -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
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
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
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
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
Ghommie
c0f3317c01 mime/clown masks' face concealment altclick toggle. Plasmaman helmets' welding visors & smileys port. 2020-10-16 20:27:09 +02:00
BlueWildrose
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
silicons
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
Putnam3145
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
Vynzill
cbe9f6c12a makes eyes glow once again with high luminosity (#13554) 2020-10-15 13:37:09 +02:00
BlueWildrose
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
DeltaFire15
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
Timothy Teakettle
8287005dd5 does what it says on the title (#13563) 2020-10-15 11:49:05 +02:00
zeroisthebiggay
ea80867cda Update legion.dm (#13566) 2020-10-15 11:48:12 +02:00
silicons
d31381596f Update datum_pipeline.dm 2020-10-14 00:41:21 -07:00
silicons
f6f5f7f4d0 Update datum_pipeline.dm 2020-10-13 16:49:12 -07:00
silicons
d148ac2aab Merge pull request #13529 from Putnam3145/superconductivity-planets 
Makes planetary atmos no longer superconduct
 2020-10-13 11:53:11 -07:00
Putnam3145
78a9c61952 Makes dwarf text not check every replacement every time. (#13346) 
* Makes dwarf text not check every replacement every time.

* Apply suggestions from code review

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-10-12 13:26:18 +02:00
silicons
ff46bfda10 Merge pull request #13547 from zeroisthebiggay/crepe 
security fashion power crêpe but it's a sheath for your anime sword
 2020-10-11 17:33:29 -07:00