shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,169 Commits 5 Branches 0 Tags
e26f1cd78b36003964906eaf2c67dbe7bb79c9a7
Commit Graph

16169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58 e26f1cd78b Merge pull request #6553 from Citadel-Station-13/upstream-merge-37165 
[MIRROR] NTNet improvements!
 2018-05-02 01:17:10 +00:00
LetterJay 7add247144 Merge pull request #6592 from Citadel-Station-13/upstream-merge-37554 
[MIRROR] Adds some more reagents to clogged vents
 2018-04-30 22:37:37 -05:00
LetterJay 154ab5022b Merge pull request #6576 from Citadel-Station-13/upstream-merge-37564 
[MIRROR] Actually links mineral sprites with their new location
 2018-04-30 22:34:53 -05:00
CitadelStationBot 15e82029ef Adds some more reagents to clogged vents 2018-04-30 12:46:59 -05:00
Jordan Brown 8f1bb462ad Merge pull request #37554 from DaxDupont/vents 
Adds some more reagents to clogged vents
 2018-04-30 12:46:58 -05:00
LetterJay 7205a15ef7 Merge pull request #6591 from Citadel-Station-13/upstream-merge-37577 
[MIRROR] Removes a duplicate comsig I accidently added
 2018-04-30 11:06:19 -05:00
LetterJay 94bebc33a0 Merge pull request #6590 from Citadel-Station-13/upstream-merge-37494 
[MIRROR] [s] Small tweaks and fixes a edgecase with machine construction
 2018-04-30 11:03:33 -05:00
LetterJay 34ce5380d6 Merge pull request #6589 from Citadel-Station-13/upstream-merge-37500 
[MIRROR] Removed /obj/item/asteroid path
 2018-04-30 11:03:16 -05:00
LetterJay 372e363257 Merge pull request #6588 from Citadel-Station-13/upstream-merge-37437 
[MIRROR] Fixes circuits being able to detect ghosts and fix pinless guns
 2018-04-30 11:02:58 -05:00
LetterJay a082da66f3 Merge pull request #6587 from Citadel-Station-13/upstream-merge-37499 
[MIRROR] Fixes bikehorn mood event
 2018-04-30 11:02:36 -05:00
LetterJay fcb1261c13 Merge pull request #6586 from Citadel-Station-13/upstream-merge-37503 
[MIRROR] Fixes Blast Cannon
 2018-04-30 11:02:16 -05:00
LetterJay 6885655022 Merge pull request #6585 from Citadel-Station-13/upstream-merge-37544 
[MIRROR] Adds a 2.5 second fire delay to beam rifles
 2018-04-30 10:21:06 -05:00
LetterJay 794d078dff Merge pull request #6584 from Citadel-Station-13/upstream-merge-37489 
[MIRROR] [s] Fixes the fryer shrinking the size of objects
 2018-04-30 10:20:53 -05:00
LetterJay b493bfe89f Merge pull request #6582 from Citadel-Station-13/upstream-merge-37496 
[MIRROR] IC weapon mechanism only works when assembly is on turf
 2018-04-30 10:11:54 -05:00
LetterJay e2ef2ee0f3 Merge pull request #6583 from Citadel-Station-13/upstream-merge-37498 
[MIRROR] Fixes glass stack explosion act
 2018-04-30 09:43:13 -05:00
LetterJay 4955bb35aa Merge pull request #6581 from Citadel-Station-13/upstream-merge-37547 
[MIRROR] fixes teleprod inhands
 2018-04-30 09:42:33 -05:00
LetterJay 9bb7ec6bf3 Merge pull request #6580 from Citadel-Station-13/upstream-merge-37481 
[MIRROR] Readds BZ Cannisters for Xenobiology
 2018-04-30 09:42:21 -05:00
LetterJay 6672d8856e Merge pull request #6579 from Citadel-Station-13/upstream-merge-37422 
[MIRROR] Adds a cooldown to PDA send to all messages.
 2018-04-30 09:42:06 -05:00
LetterJay dc5a3da4d8 Merge pull request #6578 from Citadel-Station-13/upstream-merge-37509 
[MIRROR] Makes nutrition level show up on self-inspect
 2018-04-30 09:41:50 -05:00
CitadelStationBot b30dfd9133 Removes a duplicate comsig I accidently added 2018-04-30 09:32:58 -05:00
vuonojenmustaturska 3fc7b4ca3b Merge pull request #37577 from kevinz000/patch-495 
Removes a duplicate comsig I accidently added
 2018-04-30 09:32:58 -05:00
CitadelStationBot 6eeca8466a [s] Small tweaks and fixes a edgecase with machine construction 2018-04-30 05:00:25 -05:00
Jalleo 987cce76ed [s] Small tweaks and fixes a edgecase with machine construction (#37494) 
* Puts back required time for the emitter and field_generator and also removes a certain issue that certain people were causing

* Couple of things I missed

* I noticed the error with regards to atom and changed to obj like I was trying to originally. Also its fine to build on tables that wasnt the issue with this specific aspect.

* Edge windows. We need those.

* optimised the checks to be behind a if check for when you are actually needing to make something for the floor...

* Corrects a input proc by request

* Working is not my strong suit.
 2018-04-30 05:00:24 -05:00
CitadelStationBot 694dd1a64e Removed /obj/item/asteroid path 2018-04-30 04:57:09 -05:00
ShizCalev 3160d7771d Removed /obj/item/asteroid path (#37500) 
* Cleans up some item paths

* removed kebab
 2018-04-30 04:57:09 -05:00
CitadelStationBot 55b8c84807 Fixes circuits being able to detect ghosts and fix pinless guns 2018-04-30 04:55:55 -05:00
kevinz000 7feea76eee Fixes circuits being able to detect ghosts and fix pinless guns (#37437) 
* Circuit exploit fixes

* Update input.dm
 2018-04-30 04:55:55 -05:00
CitadelStationBot 324168c39f Fixes bikehorn mood event 2018-04-30 04:55:47 -05:00
vuonojenmustaturska 665bd35f78 Merge pull request #37499 from ShizCalev/bikehorn-fix 
Fixes bikehorn mood event
 2018-04-30 04:55:47 -05:00
CitadelStationBot ea8fc86272 Fixes Blast Cannon 2018-04-30 04:53:33 -05:00
Fox McCloud e2328a122e Fixes Blast Cannon (#37503) 
* Fixes Blast Cannon

* no magic numbers

* tweak
 2018-04-30 04:53:32 -05:00
CitadelStationBot 51c102ddd8 Adds a 2.5 second fire delay to beam rifles 2018-04-30 04:53:21 -05:00
kevinz000 3ba3d5fb5e beam rifle delay (#37544) 2018-04-30 04:53:21 -05:00
CitadelStationBot 14a10492af [s] Fixes the fryer shrinking the size of objects 2018-04-30 04:52:09 -05:00
ShizCalev 948f34406a [s] Fixes the fryer shrinking the size of objects (#37489) 
* Fixes the fryer shrinking the size of objects

* few more vars
 2018-04-30 04:52:08 -05:00
CitadelStationBot c2ca8e8bf3 Fixes glass stack explosion act 2018-04-30 04:50:56 -05:00
ShizCalev 5adabb4b91 Fixes glass stack explosion act (#37498) 2018-04-30 04:50:55 -05:00
CitadelStationBot 7b0975cddc IC weapon mechanism only works when assembly is on turf 2018-04-30 01:31:06 -05:00
Evsey Antonovich 6df3ffcddf IC weapons only works on turfs (#37496) 2018-04-30 01:31:06 -05:00
CitadelStationBot f1f86fc895 fixes teleprod inhands 2018-04-30 01:16:39 -05:00
Trevor Serpas 4a7ee96b76 fixes teleprod inhands (#37547) 
* adds teleprod inhands

Because stunbatons not having inhands is kinda an issue.

* Removes my shit sprites, moves original sprites to the correct file
 2018-04-30 01:16:39 -05:00
CitadelStationBot afb9ae7f2f Readds BZ Cannisters for Xenobiology 2018-04-30 01:12:23 -05:00
YakumoChen 8bb3a4ec75 Readds BZ Cannisters for Xenobiology (#37481) 
* update BoxStation.dmm

Adds BZ to Xeno

* Update DeltaStation2.dmm

adds BZ to Xeno

* Update MetaStation.dmm

Updates Meta's Xeno with BZ

* Update PubbyStation.dmm

Adds BZ to Pubby's Xeno
 2018-04-30 01:12:22 -05:00
CitadelStationBot cdae634c0e Adds a cooldown to PDA send to all messages. 2018-04-30 01:08:03 -05:00
Dax Dupont a705b2c31c Adds a cooldown to PDA send to all messages. (#37422) 
* Adds a cooldown to PDA send to all messages.

* aaa

aaa

* forgot this one

* condom
 2018-04-30 01:08:03 -05:00
CitadelStationBot 13de05725a Makes nutrition level show up on self-inspect 2018-04-30 00:17:59 -05:00
Mickyan 01e4304326 Makes nutrition level show up on self-inspect (#37509) 
* Makes nutrition level shows up on self-inspect

* Changed to switch statement, edited flavor text
 2018-04-30 00:17:59 -05:00
kevinz000 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
CitadelStationBot dbd62d2703 Actually links mineral sprites with their new location 2018-04-29 19:06:14 -05:00
pigeons 07bbc4d3af Actually links mineral sprites with their new location (#37564) 
Fixes sprites being broken
 2018-04-29 19:06:14 -05:00