shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,262 Commits 5 Branches 0 Tags
fb95d873aa14855958b595d50221d44ec99f6831
Commit Graph

3250 Commits

Author SHA1 Message Date
Ghom
fb95d873aa Merge pull request #13383 from Citadel-Station-13/silicons-patch-37 
fixes bomb component allowing pickup
 2020-10-01 11:42:21 +02:00
Putnam3145
44f05bcb21 Merge pull request #13372 from Citadel-Station-13/silicons-patch-35 
please stop using explosive holoparasites to make instant kill toolboxes
 2020-10-01 02:35:12 -07:00
Timothy Teakettle
106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
Ghom
868e464b40 fixes linter issues, removes acid degrading armor (#13399) 
* fix

* more

* Update brawn.dm

* Update ticketmachine.dm
 2020-09-19 15:04:48 +02:00
silicons
b9315c5080 Update airlock.dm 2020-09-18 04:26:22 -07:00
silicons
ca8b13b86a Merge pull request #13255 from timothyteakettle/limbs 
you can choose limbs to be prosthetic/amputated
 2020-09-16 00:31:18 -07:00
silicons
95ebeac5b6 fix 2020-09-15 17:27:11 -07:00
DeltaFire
2d8655d712 plushie shapeshifter 2020-09-13 03:25:43 +02:00
silicons
18d949e674 Merge pull request #13357 from TheObserver-sys/BrassDatumDirectToYou 
Brass Material Datum: "Sbetr Jryy!"
 2020-09-11 14:15:54 -07:00
silicons
89f246db39 Merge pull request #13373 from BlueWildrose/why_my_hood_no_color 
Fixed toggleable polychromic hoods/helmets not polychroming with their suit
 2020-09-11 14:14:16 -07:00
Blue Wildrose
680872e08b 100% less band-aidy polyhood solution 2020-09-10 21:02:27 -07:00
silicons
9c58dbf2c5 Update killerqueen.dm 2020-09-10 12:00:17 -07:00
Blue Wildrose
f634a31bfb Update polychromic.dm 2020-09-09 15:28:45 -07:00
silicons
4f4b849b23 Update killerqueen.dm 2020-09-08 20:52:28 -07:00
silicons
2fdcfa4f07 Update killerqueen.dm 2020-09-08 20:50:06 -07:00
silicons
07b28f40de Merge pull request #13359 from Ghommie/Ghommie-cit838 
Turf visuals fix plus corrected names of a couple things.
 2020-09-07 13:42:05 -07:00
Ghommie
16e0292270 fixed. 2020-09-06 20:41:35 +02:00
Ghommie
71aa5b9642 Emergent runtime issue. 2020-09-06 20:40:24 +02:00
Ghommie
4a04b22b72 Turf visuals fix plus corrected names of a couple things. 2020-09-06 18:53:01 +02:00
The0bserver
4dacbbb0a9 deeper brass color™ (and damage) 2020-09-05 20:34:49 -04:00
The0bserver
cddd46fce3 Maybe this will work. Maybe it won't. 2020-09-05 18:52:20 -04:00
Putnam3145
d6127d71a8 Merge pull request #13352 from timothyteakettle/fix-accents-but-pushed-this-time 
lets ipcs talk but i actually push my changes this time
 2020-09-05 08:40:31 -07:00
Timothy Teakettle
f9bb245acc DONT MAKE THE SAME MISTAKE 2020-09-05 16:32:41 +01:00
Timothy Teakettle
93501e2d3d sorry ipcs 2020-09-05 16:24:58 +01:00
silicons
7b50b22c7b Merge pull request #13244 from lolman360/AnPrimAssistants 
Blacksmithing 2: Anarcho-Primitivist Assistants (travis don't fail on me now)
 2020-09-05 02:20:11 -07:00
silicons
e110945568 Merge pull request #13289 from kiwedespars/heretics-touchup 
heretics touchup
 2020-09-05 02:15:21 -07:00
Artur
3fb72e0fea Merge remote-tracking branch 'upstream/master' into TGUI_Updoot 2020-09-04 11:43:31 +03:00
timothyteakettle
90eef6efc9 Merge remote-tracking branch 'upstream/master' into limbs 2020-09-03 22:46:32 +01:00
Putnam3145
bce53f71ce Merge pull request #13322 from timothyteakettle/fix-accents 
makes handle_speech in ipc accent actually return the speech args so ipcs can talk
 2020-09-02 17:56:40 -07:00
Ghommie
a455092c1f aaaa 2020-09-02 19:27:04 +02:00
Ghommie
dc9b024fae Blemishes begone. 2020-09-02 19:16:16 +02:00
Artur
a2d34b7524 Undoes Theme shit 2020-09-02 19:44:19 +03:00
Artur
8d073bbce6 Merge remote-tracking branch 'upstream/master' into TGUI_Updoot 2020-09-02 19:05:18 +03:00
Artur
c79e9fbc0b https://github.com/tgstation/tgstation/pull/53263 2020-09-02 18:48:09 +03:00
Artur
3bef4ba35e TGUI updates + statpanel 2020-09-02 17:52:47 +03:00
lolman360
5697ab2ff4 Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-09-01 16:57:02 +10:00
silicons
77cf561f7f Merge pull request #13316 from timothyteakettle/ckey-pref 
pref for hiding your ckey from roundend report
 2020-08-31 21:19:37 -07:00
lolman360
05bd0579ca Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-09-01 11:23:57 +10:00
timothyteakettle
a9ec2254ba hide your ckey 2020-08-31 01:47:49 +01:00
Timothy Teakettle
34393a187b fix ipcs 2020-08-30 16:27:09 +01:00
silicons
4a3b6054d3 Merge pull request #13266 from Ghommie/Ghommie-cit836 
Fixing some mistakes with the priority overlays removal PR.
 2020-08-29 21:22:44 -07:00
silicons
84734591ed Merge pull request #13268 from timothyteakettle/accents 
separates tongues speech handling into accent datums
 2020-08-29 21:22:11 -07:00
silicons
7ad037ee53 Merge pull request #13276 from timothyteakettle/emotes 
every emote is unrestricted
 2020-08-29 21:21:01 -07:00
silicons
e677804bd7 Merge pull request #13277 from Chiirno/AnaPanRework 
Reworks Anatomic Panacea
 2020-08-29 21:19:47 -07:00
Letter N
ae482c1bb8 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-29 14:09:56 +08:00
kiwedespars
a7d68281a3 new changes 
- runes can now be destroyed by non-heretics using a bible or a null rod
- mansus grasp now has a unique inhand color.
- madness grasp now has a unique inhand color.
- blood siphon is now redder.
- silence spell, lasts 20 seconds, gives an obvious message to the victim.
- fire immunity passive for ash
- guaranteed dislocation passive for flesh
- rust grasp passive for disgusting mood/vomiting
- rust grasp cooldown reduced by 75% on hit
- living heart now checks z-level when telling you where someone is.
- grasp of decay: forced corrosion for 20 seconds, can make you vomit. probably shitcode.
- madness touch: give people trauma, braindamage and a terrible mood.
- nightwatcher's rite: fire shotgun that can do 75 damage on point blank
- flesh sickle buffed a bit.
- descriptions touched up a bit.
 2020-08-28 16:42:25 -07:00
raspy-on-osu
4f2f6b537e credit's already given in the pr let's not 2020-08-28 13:44:41 -04:00
Timothy Teakettle
1d943a34ef heterochromia 2020-08-28 18:30:28 +01:00
raspy-on-osu
96d006f551 oops 2020-08-27 23:48:19 -04:00