shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,197 Commits 5 Branches 0 Tags
1a2abc5a2edca6dc4626e35cdbdd2d40307f25da
Commit Graph
2041 Commits
Author SHA1 Message Date
DeltaFire15andGitHub 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
BlueWildroseandGitHub 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
DeltaFire15GitHubGhom
 		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
siliconsGitHubLetter NPutnam3145
 		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
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 1092eacc6e Merge pull request #13397 from ArchieBeepBoop/microfans 
Micro Powered Fans!
 2020-09-27 00:03:43 -07:00
timothyteakettle 04a7c66561 fix turret removal 2020-09-26 01:38:04 +01:00
Putnam 1c99e59552 Makes cryo pods no longer replace already-won objectives. 2020-09-23 03:39:00 -07:00
Artur 435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
Dip a3bf4ac580 Fixes requested 2020-09-19 13:02:08 -03:00
Dip fa516fc517 Set atmos pass to yes on assembly 2020-09-16 20:51:40 -03:00
Dip 8d33b3a8da convert to machinery type 2020-09-16 20:28:31 -03:00
Dip 2e9265937d duplicate fan bugfix 2020-09-16 20:01:37 -03:00
Dip 7e00d81758 Microfan Rework 2020-09-16 19:28:59 -03:00
Dip 394d383746 Clone Microfans 2020-09-15 19:27:58 -03:00
siliconsandGitHub 10a753bf4d Merge pull request #13368 from Tupinambis/CoggyDoggy 
Cogstation Fixes and Improvements
 2020-09-11 14:14:59 -07:00
Blue Wildrose 81e9d34684 I love having my ears assaulted by 50 minesweeper_menuselect.oggs 2020-09-11 09:34:56 -07:00
timothyteakettle d2f4d675a4 fuck 2020-09-10 03:55:24 +01:00
Timothy Teakettle f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00
Tupinambis fe7a21ebc7 Coggers Fixes + Mass Driver Things 2020-09-07 22:33:54 -05:00
BlackMajorandGitHub 1943a2fdd7 Merge pull request #13246 from silicons/anomaly_manufacturing 
anomaly manufacturing port from tg. supermatter anomaly generation nerfed to 20% rather than removed
 2020-09-06 17:53:35 +12:00
Artur c79e9fbc0b https://github.com/tgstation/tgstation/pull/53263 2020-09-02 18:48:09 +03:00
Putnam3145andGitHub 7c5197f383 Merge pull request #13249 from Citadel-Station-13/silicons-patch-25 
removes firedoor autoopen on touch
 2020-08-29 22:34:43 -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
shellspeed1 de7ecefad2 minor description change 2020-08-24 15:07:40 -07:00
shellspeed1 142dee3645 Update iv_drip.dm 2020-08-24 12:47:56 -07:00
siliconsandGitHub e1e0d5e1da Update firedoor.dm 2020-08-23 06:50:47 -07:00
silicons b2a38a09a1 circuit 2020-08-23 05:59:24 -07:00
Letter N 6ba29acd4e uses some cit procs. and how the fuck did i forget to componentualize this 2020-08-22 16:08:05 +08:00
Letter N afe32406c0 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-22 13:40:36 +08:00
siliconsandGitHub 120bcfc00c Merge pull request #13178 from lolman360/plumb 
[READY] ports plumbing (no more waiting for tgui4)
 2020-08-20 21:32:26 -07:00
Letter N 2dd3d71b19 config&copypaste chang. 2020-08-20 16:36:24 +08:00
Letter N 3b7bca28b3 Functional* code 2020-08-20 13:50:33 +08:00
silicons 8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
LinandGitHub d287f44d9a Merge pull request #13045 from silicons/coggers 
ports bronze (fake clockwork) airlocks and windows
 2020-08-16 20:20:03 -05:00
Letter NandGitHub 3ff770b38f wrong state 2020-08-13 12:13:42 +08:00
Letter NandGitHub 2eb6eb5032 state moment 2020-08-13 12:01:36 +08:00
Letter N 081f07e259 bye! 2020-08-12 16:38:36 +08:00
lolman360andGitHub 6f7badda41 Merge branch 'master' into plumb 2020-08-12 09:03:11 +10:00
siliconsandGitHub a8d61b60ef Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch 
adds a cybernetic eyepatch to the syndicate uplink
 2020-08-11 01:47:32 -07:00