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

1119 Commits

Author SHA1 Message Date
LetterJay
908394f1e2 Merge pull request #6640 from Citadel-Station-13/upstream-merge-37432 
[MIRROR] Fixes Several Machines Materials Insertion
 2018-05-04 22:57:32 -05:00
CitadelStationBot
7bab794c6b Merge pull request #6627 from Citadel-Station-13/upstream-merge-37455 
[MIRROR] deadly brain tumor now gives -3 points
 2018-05-04 22:47:13 -05:00
Fox McCloud
f5031bc4f7 Fixes Several Machines Materials Insertion (#37432) 
* Fixes Several Machines Materials Insertion

* attackby disable and show on examine fix
 2018-05-04 04:40:56 -05:00
deathride58
288c61b1c1 obfuscates the gamemode in topic() calls 2018-05-03 21:14:15 -04:00
Armhulen
fa6292dbd5 deadly brain tumor now gives -3 points (#37455) 
* i can tweak it if need be yadda yadda one line change

* ok lets be SENSIBLE.
 2018-05-02 21:24:26 -05:00
deathride58
55566461c6 Merge pull request #6601 from Citadel-Station-13/upstream-merge-37565 
[MIRROR] Modifies component transfer to make ChangeTurf able to transfer components
 2018-05-02 13:59:14 +00:00
deathride58
f35bfa22e4 Merge pull request #6614 from Citadel-Station-13/upstream-merge-37475 
[MIRROR] H.O.G.A.N. lawset
 2018-05-02 01:33:19 +00:00
deathride58
5c40a38457 Merge pull request #6609 from Citadel-Station-13/upstream-merge-37584 
[MIRROR] Readds missing nuked narsie cinematic.
 2018-05-02 01:30:19 +00:00
deathride58
f248685db2 Merge pull request #6607 from Citadel-Station-13/upstream-merge-37579 
[MIRROR] Fix placing boxes in storage implants
 2018-05-02 01:29:41 +00:00
deathride58
613fadf057 Update _concrete.dm 2018-05-01 21:27:01 -04:00
deathride58
d26ba53e91 Merge pull request #6596 from Citadel-Station-13/upstream-merge-37513 
[MIRROR] Adds traits for a character's preference towards pineapples.
 2018-05-02 01:25:04 +00:00
deathride58
4851b9bd82 Merge pull request #6559 from Citadel-Station-13/upstream-merge-37501 
[MIRROR] Fixes missing icons
 2018-05-02 01:19:58 +00:00
deathride58
e26f1cd78b Merge pull request #6553 from Citadel-Station-13/upstream-merge-37165 
[MIRROR] NTNet improvements!
 2018-05-02 01:17:10 +00:00
deathride58
e8f4602716 Update implant.dm 2018-05-01 21:16:05 -04:00
Jordan Brown
d47b71cf23 Merge pull request #37475 from 81Denton/OH-YEAH-BROTHER 
H.O.G.A.N. lawset
 2018-05-01 15:40:09 -05:00
AnturK
76302a217e Readds missing nuked narsie cinematic. (#37584) 2018-05-01 11:05:16 -05:00
Tad Hardesty
34321883cc Fix placing boxes in storage implants 2018-05-01 07:30:07 -05:00
Jordan Brown
1675490652 Modifies component transfer to make ChangeTurf able to transfer components 2018-04-30 21:16:48 -05:00
Jordan Brown
12eb6a8a97 Merge pull request #37513 from ShizCalev/pineapple-memes 
Adds traits for a character's preference towards pineapples.
 2018-04-30 13:02:05 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
deathride58
6f13d2c2e9 Merge pull request #6546 from Citadel-Station-13/upstream-merge-37380 
[MIRROR] Refactors and fixes RPEDs
 2018-04-29 22:45:28 +00:00
kevinz000
fe8e1cd61c [syou can no longer insert a storage object into itself, and therefore, no longer bohbomb with one boh (#37410) 
* paradox

* fine, byond.

* src.
 2018-04-29 15:21:02 -05:00
LetterJay
ab8355968c Update rped.dm 2018-04-29 02:28:43 -05:00
LetterJay
0bca7362e3 Merge pull request #6511 from Citadel-Station-13/upstream-merge-37389 
[MIRROR] Removes redundant COMPONENT_INCOMPATIBLE crashes
 2018-04-29 02:20:25 -05:00
LetterJay
57270f84d9 Merge pull request #6493 from Citadel-Station-13/upstream-merge-37299 
[MIRROR] Fixes ghosts being unable to see into nonadjacent bags
 2018-04-29 02:19:14 -05:00
Jordan Brown
db142667b7 Merge pull request #37501 from ShizCalev/icon-fixes 
Fixes missing icons
 2018-04-28 14:54:45 -05:00
kevinz000
6ed120aad4 NTNet improvements! 2018-04-27 20:24:28 -05:00
Dax Dupont
4850230fc4 Refactors and fixes RPEDs 2018-04-27 13:13:37 -05:00
vuonojenmustaturska
d6b48869d8 Adds a stationloving component to replace a couple of flags and SSinbounds with (#37436) 
* station lovin' happened so fast

* Update stationloving.dm

* less qdel memes

* imbue soul signal

* rename imbue soul signal

* dupemode

* henk

* Update atoms_movable.dm

* Update nuclearbomb.dm

* Update nuclearbomb.dm
 2018-04-27 07:37:15 -05:00
deathride58
80a4f04d94 Merge pull request #6524 from Citadel-Station-13/upstream-merge-37342 
[MIRROR] Makes it possible to see tiles past z transitions
 2018-04-27 09:39:52 +00:00
deathride58
28904ec033 Merge pull request #6522 from Citadel-Station-13/upstream-merge-37431 
[MIRROR] New Trait: Acute Blood Deficiency
 2018-04-27 09:38:19 +00:00
deathride58
2ee4d3e77d Merge pull request #6515 from Citadel-Station-13/upstream-merge-37326 
[MIRROR] Removes SCP_294
 2018-04-27 09:35:43 +00:00
deathride58
505458cfc9 Update riding.dm 2018-04-27 05:34:06 -04:00
deathride58
6d8ade932d Update lockon_aiming.dm 2018-04-27 05:33:37 -04:00
deathride58
d37ff6135a Merge branch 'master' into upstream-merge-37389 2018-04-27 09:32:54 +00:00
deathride58
f8406d1bfe Merge pull request #6507 from Citadel-Station-13/upstream-merge-37375 
[MIRROR] fixes cqc working outside chef assigned areas
 2018-04-27 09:31:04 +00:00
deathride58
35cc70dd04 Merge pull request #6494 from Citadel-Station-13/upstream-merge-37263 
[MIRROR] 's is no longer a dirty reminder of snake lisps for the traumatized (phobia regex fix)
 2018-04-27 09:27:29 +00:00
deathride58
634e896e11 Merge branch 'master' into upstream-merge-37299 2018-04-27 09:22:31 +00:00
deathride58
c17d48affe Merge pull request #6485 from Citadel-Station-13/upstream-merge-37359 
[MIRROR] Fixes thermite immunities [s]
 2018-04-27 09:17:43 +00:00
LetterJay
4647168c78 Merge pull request #6504 from Citadel-Station-13/upstream-merge-37379 
[MIRROR] Fixes duplicate logic causing doors to be perma stuck on shock mode.
 2018-04-27 00:11:59 -05:00
Jordan Brown
5994a9fd0b Merge pull request #37342 from ninjanomnom/vis-border 
Makes it possible to see tiles past z transitions
 2018-04-26 15:25:36 -05:00
Jordan Brown
354dc0bcf9 Merge pull request #37431 from Mickyan/anemic 
New Trait: Acute Blood Deficiency
 2018-04-26 15:21:11 -05:00
Armhulen
17aa0acef8 Removes SCP_294 (#37326) 
* aaah sweet essence

* bye bye sprites

* goodbye machine code

* bye bye blacklist entry

* whoops

* scp gone from runtime

* bye bye ract

* bye bye space ruin folder

* bye bye area
 2018-04-25 10:05:57 -05:00
Jordan Brown
f0a259d3e5 Removes redundant COMPONENT_INCOMPATIBLE crashes 2018-04-25 05:54:41 -05:00
kevinz000
42d0541a28 fixes cqc working outside chef assigned areas (#37375) 
* cqc

* Update martial.dm

* Update cqc.dm

* Update cqc.dm

* Update human_defense.dm

* Update human_defense.dm

* Update human_defense.dm
 2018-04-24 10:23:34 -05:00
Dax Dupont
e748439b15 Fixes duplicate logic causing doors to be perma stuck on mike pence mode. (#37379) 2018-04-24 08:14:12 -05:00
Noka
881331e232 test (#37263) 2018-04-23 09:06:42 -05:00
Jordan Brown
1cdea15616 Fixes ghosts being unable to see into nonadjacent bags 2018-04-23 09:03:27 -05:00
AnturK
1d3f9bd4ec Fixes thermite immunities (#37359) 2018-04-23 02:06:22 -05:00
Poojawa
e5f9765d2a datums/controller stuff 2018-04-23 00:02:42 -05:00