shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,955 Commits 5 Branches 0 Tags
7dfd6005d90eae502a27e021237cddf71535ae6c
Commit Graph

2945 Commits

Author SHA1 Message Date
Ghommie
a1a3bbe99f Skeleton tweaks (featuring "makes halloween skeletons not the overpowered pirate ones") 2019-10-06 19:16:13 +02:00
Ghommie
81fc0c1b32 more foolproofing. 2019-10-02 00:37:02 +02:00
Ghommie
e635a05d16 errors. 2019-10-01 23:43:38 +02:00
Ghommie
d2300765b2 adjacency checks. 2019-10-01 23:16:47 +02:00
Ghommie
cfcd325778 reworking the shoving people action. 2019-10-01 23:13:08 +02:00
kevinz000
250c6ed986 Merge pull request #9367 from Poojawa/totally-radical 
Totally RADical. Rad levels for Medhud, radiation flags added to storage, suits.
 2019-10-01 00:12:32 -07:00
Poojawa
9bd6f83034 Applies rad_flags to a lot of common items + bluespace bags 
Also applies fireproofing to Captain's bag. Eng Sachel /duffle get it too for consistency.
 2019-09-28 03:22:17 -05:00
Poojawa
041a4b4ed1 Corrects scanner measurment information 2019-09-28 03:18:00 -05:00
kevinz000
0febc1977a Merge pull request #9191 from Linzolle/fireman 
Ports fireman carrying from /tg/
 2019-09-28 00:38:08 -07:00
kevinz000
d7d4e3cbe2 Merge pull request #9349 from Ghommie/Ghommie-cit210 
Fixes advanced med scanner upgrades, and other cyborg upgrades' incompatibility with dogborgs.
 2019-09-28 00:22:38 -07:00
kevinz000
cc64b8e0a4 Merge pull request #9320 from Ghommie/Ghommie-cit200 
ports "Resisting out of bucklecuffs takes an amount of time dependent on cuffs used", also toy handcuffs no longer demoralize the wearer.
 2019-09-28 00:22:13 -07:00
kevinz000
3ce5b318ca Merge pull request #9317 from Ghommie/Ghommie-cit199 
Ports sleepy pens and emagged borg cookies buffs (also "chloralhydratedelayed" removal), plus tirizene buff.
 2019-09-28 00:21:47 -07:00
kevinz000
5562db4ed4 Merge pull request #8914 from Ghommie/Ghommie-cit147 
Updating spraycans and crayons.
 2019-09-28 00:20:42 -07:00
nik707
3f1f234686 Merge pull request #9170 from Trilbyspaceclone/more_cooking2 
Makes peaches used in crafting a lot more, grammer fixes and new icecreams and floats - Remakes charrie shakes into icecreams rather then drinks
 2019-09-26 23:54:17 -05:00
TrilbySpaceClone
41fbb759b2 Merge branch 'master' into more_cooking2 2019-09-25 14:56:11 -04:00
kevinz000
9270adba8a Merge pull request #9334 from Ghommie/Ghommie-cit204 
Enables emojis for PDA messages.
 2019-09-23 20:17:25 -07:00
Ghommie
0389293d4a comma 2019-09-24 02:40:43 +02:00
Ghommie
ee8f1022cc Fixes advanced med scanner upgrades, and other cyborg upgrades' incompatibility with dogborgs. 2019-09-24 02:02:24 +02:00
Ghommie
ff451c8cf4 I don't want to send emoji assets to every machine interfacing with PDA messages. 
Just the chat tab.
 2019-09-22 14:50:37 +02:00
Ghommie
bf2f4b5df1 Enables emojis for PDA messages. 2019-09-21 22:42:06 +02:00
Ghommie
33c3f0834e Prevents sofas being wielded and thus transformed into normal chairs. 2019-09-21 20:01:42 +02:00
kevinz000
5608d37fd5 Merge pull request #9263 from Trilbyspaceclone/batter_up 
Adds a new traitor bundle - Synda Major Leage Player
 2019-09-21 01:56:41 -07:00
Ghommie
45adfd5bab making it compile. 2019-09-20 23:20:44 +02:00
Ghommie
1f2c19c1da ports "Resisting out of bucklecuffs takes an amount of time dependent on cuffs used", also toy handcuffs no longer demoralize the wearer. 2019-09-20 22:57:06 +02:00
kevinz000
9108c1ce89 Merge pull request #9203 from Trilbyspaceclone/fancy 
Makes brass tools look better*
 2019-09-20 12:09:33 -07:00
Ghommie
ec9bf9ed17 Ports sleepy pens and emagged borg cookies buffs, also buffing tirizene. 2019-09-20 19:04:28 +02:00
Ghommie
277f031143 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147 2019-09-20 02:27:39 +02:00
Ghommie
5e52c62f29 actual balance. 2019-09-17 03:41:53 +02:00
Ghommie
0d9b284784 unneeded variable, no gameplay changes. 2019-09-16 18:12:05 +02:00
Ghommie
ca95d39a46 Slowing down police baton and tele baton speed. 2019-09-16 17:47:22 +02:00
kevinz000
eab0b8934f Merge pull request #9279 from Ghommie/Ghommie-cit192 
Fixing undergarments color preferences resetting each round.
 2019-09-13 10:43:43 -07:00
kevinz000
42613d1800 Merge pull request #9251 from Linzolle/chaplain-fashion-time 
Allow all chaplain gear to equip the same things in their suit storage
 2019-09-13 10:42:42 -07:00
Linzolle
213bd2fc6b fixes 2019-09-12 23:35:21 -05:00
Ghommie
e0a29ec001 Fixing undergarments color resetting each round. 2019-09-12 02:48:26 +02:00
kevinz000
f4bff19592 Merge pull request #9260 from dapnee/trim-decals 
Ports trim decals
 2019-09-11 03:26:47 -07:00
kevinz000
076b6c8699 Merge pull request #9077 from Sishen1542/id-boingo 
No ID insertion for everything except the hop console
 2019-09-10 22:04:48 -07:00
Trilbyspaceclone
d61afe0021 Update uplink_kits.dm 2019-09-10 20:29:31 -04:00
Trilbyspaceclone
a751a73113 Apply suggestions from code review 
thx Ceb

Co-Authored-By: cebutris <cebutris2000@gmail.com>
 2019-09-10 18:52:49 -04:00
Trilbyspaceclone
02771c9d27 Why didnt my last commit save at all? 2019-09-08 22:10:31 -04:00
TrilbySpaceClone
0e12a4f8d1 and swing! 2019-09-08 21:39:32 -04:00
Dap
9f275ebf01 Ports trim decals 
## About The Pull Request

So smooth, so helpful. These decals can be used to point newer players to departments, or as trim to border departments.

## Changelog
🆑
add: Trim lines!
/🆑
 2019-09-08 10:51:05 -06:00
kevinz000
3e9d37e70d Update plushes.dm 2019-09-07 17:13:21 -07:00
kevinz000
b8374feafd Update plushes.dm 2019-09-07 17:03:06 -07:00
Linzolle
64b757f404 refactor suits 2019-09-07 17:10:10 -05:00
Linzolle
20ea620e9e literally why even 2019-09-07 16:46:25 -05:00
kevinz000
8f577e910a Merge pull request #9238 from Trilbyspaceclone/surgery_stuff 
Adds two more surgerys - Embalming and Body Rejuvenation
 2019-09-07 11:37:13 -07:00
kevinz000
09ed526594 Merge pull request #9089 from Sishen1542/rapid-construction-dabvice 
RCDs can be upgraded to create computer/machine frames, moved deconstruction to the upgrade tier
 2019-09-07 11:35:09 -07:00
kevinz000
87cf0b971a Merge pull request #9221 from Sishen1542/chappy 
adds some new nullrods with some back end null rod refactors
 2019-09-06 16:47:46 -07:00
Chayse Ramsay
0cf1415969 [SPEEDMERGE] Glass Machine :b:roke 2019-09-05 16:28:18 +01:00
TrilbySpaceClone
084b37ae4e tada 2019-09-04 10:13:32 -04:00