shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,209 Commits 5 Branches 0 Tags
f1205efa0ffde32f72cacff8563ec37bbb463f7e
Commit Graph

2075 Commits

Author SHA1 Message Date
silicons
f1205efa0f Merge pull request #13885 from raspy-on-osu/spaceheater-buff 
Makes space heaters worth using
 2020-12-31 12:38:07 -07:00
raspy-on-osu
2352580b41 init 2020-12-27 05:36:49 -05:00
DeltaFire
d3f30d21cf Merge pull request #13772 from silicons/respawn_system_2 
adds a respawn/return to lobby system, tweaks cryo to preserve everything instead of just ""important items""
 2020-12-22 17:40:33 +01:00
raspy-on-osu
d3e224d9c1 init 2020-12-21 04:54:19 -05:00
Lin
3ad777f8f7 Merge pull request #13755 from silicons/colormates 
ports colormates from rp/vorestation
 2020-12-20 18:14:48 +00:00
silicons
ebd6e0cbec no backapck in backpack 2020-12-17 04:14:04 -07:00
SandPoot
3ea756a062 typo and remove badword 2020-12-16 11:43:40 -03:00
SandPoot
a0ae0c37fe upload files 2020-12-16 11:39:50 -03:00
silicons
a7aa7f2466 delete pdas 2020-12-15 07:43:35 -07:00
silicons
e87cc27803 modifications 2020-12-15 07:21:06 -07:00
silicons
4451a96997 fixes 2020-12-13 20:12:14 -07:00
silicons
31beb2dd62 Update colormate.dm 2020-12-13 06:41:40 -07:00
silicons
28a0725bd8 Update colormate.dm 2020-12-13 06:36:20 -07:00
silicons
99709a1a35 fix 2020-12-13 04:30:00 -07:00
silicons
5c830d4d44 Merge remote-tracking branch 'citadel/master' into respawn_system_2 2020-12-13 02:34:57 -07:00
silicons
a4688557d7 Cryo 2020-12-13 02:29:31 -07:00
silicons
4b20d26d2b Merge remote-tracking branch 'citadel/master' into colormates 2020-12-12 01:56:37 -07:00
silicons
e27c843296 fixes 2020-12-11 05:35:57 -07:00
silicons
13391d2af6 fix 2020-12-11 05:09:29 -07:00
silicons
599a1f0419 fix 2020-12-11 05:06:44 -07:00
silicons
76e7caad33 colormates 2020-12-11 04:54:30 -07:00
Linzolle
0ddc053a8b what if mapmerge worked 2020-12-08 17:35:21 -06:00
Linzolle
3e951d334c fix entertainment monitors 2020-12-08 17:21:14 -06:00
DeltaFire
69a1d6e603 oop 2020-12-08 16:32:34 +01:00
DeltaFire
86661a4fe0 aaaaaaaaaaaaaa 2020-12-08 16:30:09 +01:00
silicons
3cbec856a8 Update windowdoor.dm 2020-11-19 02:41:55 -07:00
silicons
f8d43b7544 Merge pull request #13679 from DeltaFire15/system-corruption 
[TESTMERGE ONLY] System Corruption for robotic species
 2020-11-18 22:54:51 -07:00
Putnam3145
9d300ade35 Merge pull request #13677 from silicons/newlines 
Adds missing EOF newlines
 2020-11-18 17:50:38 -08:00
DeltaFire
e191cd3b5b sleeper ui compartibility 
ugly but less work & less ugly than completely rewriting it.
If anyone else wants to, be my guest.
 2020-11-15 20:47:22 +01:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
DeltaFire
a9fda43bc2 makes the operating computer show toxin / corruption 
An ugly way to do this, but still LESS ugly than rewriting the entire thing. It'll be FIIIINE
 2020-11-13 02:41:34 +01:00
DeltaFire
9016abbbee *snap 2020-11-12 21:20:36 +01:00
Artur
8ce058a593 Fixes stupid mistakes 2020-11-09 14:39:51 +02:00
Artur
503d0156c6 Does the thing 2020-11-08 23:24:58 +02:00
DeltaFire15
91584053f5 Fixes a bunch of fallout from the tgui PR (#13648) 
* screamies

fixes a bunch of fallout from the tgui PR.. probably

* Empty commit to poke travis
 2020-11-01 21:59:22 +01:00
Ghommie
90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01: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
DeltaFire
a5fce4b6ed Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2 2020-10-11 15:39:41 +02:00
DeltaFire
4ccf40f775 Revert "Revert "Merge branch 'master' into robotic-limbs-PT2"" 
This reverts commit 27a099c6bf.
 2020-10-11 00:53:18 +02:00
DeltaFire
27a099c6bf Revert "Merge branch 'master' into robotic-limbs-PT2" 
This reverts commit 73b5267425, reversing
changes made to 2e780bfff2.
 2020-10-11 00:51:39 +02:00
DeltaFire
73b5267425 Merge branch 'master' into robotic-limbs-PT2 2020-10-11 00:44:28 +02:00
DeltaFire
9990337f32 fixes a bunch of portal runtimes 
Ah yes lets just change the basic portal generation proc but not change the actual calls to it for the most part, what could go wrong?!
 2020-10-10 23:40:12 +02:00
silicons
19f1e99a8c mass ports like 15 tg prs + counting (#13386) 
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-10 12:20:33 +02:00
DeltaFire
4146566af0 hoo boy 
replaces all mentions of bodypart_robotic with is_robotic_limb() where possible, adds BODYPART_HYBRID, adds helpers for organic / robotic limbs (is_robotic_limb() / is_organic_limb(), with a arg to override it accepting hybrid limbs)
Also makes the the surgery to heal robotic limbs work if the torso isn't a robot, but rather if there are robotic bodyparts, makes the IPC brain repair.. only accept IPC brains (obviously), makes the damage threshholds for robo-limbs vars instead of a fix 25 with hybrid ones predefined at 25 / 15 (trigger / mindamage), adds an error message to fixing them if already at theshhold, etc. Now just for replacing BODYPART_ORGANIC with is_organic_limb aswell where applicable.. also actual values for the other robo limbs. Fun!
 2020-10-06 17:34:13 +02:00
Hatterhat
d2657efefc its not tested but w/e 2020-10-03 17:54:07 -05: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
silicons
4d82c219f5 Merge pull request #13437 from timothyteakettle/turret-fix 
turrets will now break instead of magically poofing out of existence
 2020-09-27 00:35:06 -07:00
silicons
987cfc7582 Merge pull request #13424 from Putnam3145/fix-cryo-objective-bull 
Makes cryo pods no longer replace already-won objectives.
 2020-09-27 00:16:45 -07:00
silicons
1092eacc6e Merge pull request #13397 from ArchieBeepBoop/microfans 
Micro Powered Fans!
 2020-09-27 00:03:43 -07:00