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

3270 Commits

Author SHA1 Message Date
silicons
56a7499cef Merge pull request #13496 from Detective-Google/deadchat-kablooey 
allows players in deadchat to see explosions
 2020-10-06 17:05:06 -07:00
Detective Google
6d14d37e5f adds deadchat span 2020-10-04 13:34:36 -05:00
silicons
7f7ba4caf8 Merge pull request #13481 from DeltaFire15/smithery-fixes 
A bunch of blacksmithing fixes / tweaks
 2020-10-03 18:02:42 -07:00
silicons
20f1e0818e Merge pull request #13479 from LetterN/another-update-mayhaps 
Fixes minimap, and dmdocs other things
 2020-10-03 18:02:29 -07:00
DeltaFire
79af981467 fixes some fun limb code 2020-10-03 21:51:49 +02:00
Letter N
09283ca485 beans 2020-10-03 13:49:20 +08:00
Detective Google
52e8e2996c allows players in deadchat to see explosions 2020-10-02 14:26:11 -05:00
Timothy Teakettle
7726b0456c Merge branch 'master' into cool-ipcs 2020-10-01 21:06:16 +01:00
Letter N
84a6624b03 Update cinematic.dm 2020-10-01 18:18:24 +08:00
silicons
3149732bbb Merge pull request #13441 from Putnam3145/shiver-fever-patch 
Makes fever use the proper thresholds and shivering have thresholds at all.
 2020-10-01 03:11:23 -07:00
silicons
8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework 
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
 2020-10-01 03:01:18 -07:00
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
Letter N
5418fb5b01 fixes minimaps and cinematic, also adds some dmdoc things 2020-10-01 17:36:56 +08: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
Putnam
9f871dfa17 Makes shivering and fever not broken. 2020-09-26 11:22:24 -07:00
DeltaFire
0746116e17 fixes a bunch of blacksmithing stuff 
the blacksmithing skill is now actually dwarfy instead of not because of a typo

picking up how ingots without gloves is now not a better decision than picking them up with non-heatresistant gloves.

you can't interact with anvils while they are already being worked to prevent issues.

Also fixes associative skill level code a tiny bit.
 2020-09-25 22:04:55 +02: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
Timothy Teakettle
12bf3aebda Merge remote-tracking branch 'upstream/master' into cool-ipcs 2020-09-16 05:12:20 +01:00
Timothy Teakettle
125b50d392 Merge branch 'master' into cool-ipcs 2020-09-16 05:09:02 +01:00
Timothy Teakettle
a54314193e wire pulse prob to 10+severity/3.5 2020-09-16 03:36:46 +01: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
Timothy Teakettle
f1cd94fc97 emp rework 2020-09-09 23:14:06 +01: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