shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,926 Commits 5 Branches 0 Tags
bd6345ffd5dc67c9ae22ce180158e6e80167f4e8
Commit Graph

3396 Commits

Author SHA1 Message Date
deathride58
305849fba4 Merge pull request #5550 from Citadel-Station-13/upstream-merge-35726 
[MIRROR] Reflectors now reset the range of a projectile like before!
 2018-02-17 20:44:06 +00:00
deathride58
fc041fbb34 Merge pull request #5549 from Citadel-Station-13/upstream-merge-35732 
[MIRROR] fixes poddoor examine message
 2018-02-17 19:31:47 +00:00
deathride58
5374724165 Merge pull request #5535 from Citadel-Station-13/upstream-merge-35707 
[MIRROR] Adds rainbow slime clusterbangs
 2018-02-17 19:31:20 +00:00
deathride58
fb65a98117 Merge pull request #5516 from Citadel-Station-13/upstream-merge-35668 
[MIRROR] Quote the armor lists
 2018-02-17 19:29:50 +00:00
Dax Dupont
f31df38f83 Reflectors now reset the range of a projectile like before! (#35726) 
* Reflectors now reset the range of a projectile.

* how about dem apples
 2018-02-17 13:18:08 -06:00
yorii
f03905ebde fixes poddoor examine message (#35732) 
examining a blast door do longer gives the regular door examination about the maintenance panel.
 2018-02-17 13:16:53 -06:00
LetterJay
c4d5dd34a3 Merge pull request #5548 from Citadel-Station-13/upstream-merge-35705 
[MIRROR] Fixes lava burning unconstructed HE-pipes
 2018-02-17 11:49:49 -06:00
LetterJay
3c8fd612a0 Merge pull request #5547 from Citadel-Station-13/upstream-merge-35722 
[MIRROR] Fixes extremely thicc robots
 2018-02-17 11:49:15 -06:00
LetterJay
559ec2fcf6 Merge pull request #5543 from Citadel-Station-13/upstream-merge-35604 
[MIRROR] Refactors mech construction datums
 2018-02-17 11:47:48 -06:00
LetterJay
fb7e1b1438 Merge pull request #5542 from Citadel-Station-13/upstream-merge-35735 
[MIRROR] RESISTHOT species can put out fires with their hands
 2018-02-17 11:47:35 -06:00
BordListian
dbdb29d913 - Makes lava not burn unconstructed heat-exhanging pipes (#35705) 2018-02-17 10:14:20 -06:00
Dax Dupont
d368c42a98 Fixes extremely thicc robots (#35722) 
* Fixes extremely fat robots

* grasp
 2018-02-17 10:13:08 -06:00
vuonojenmustaturska
c64a8a8d6b Merge pull request #35604 from ACCount12/construction_datum_refactor 
Refactors mech construction datums
 2018-02-17 10:00:09 -06:00
LetterJay
b6ad24b9da Merge pull request #5541 from Citadel-Station-13/upstream-merge-35734 
[MIRROR] Cleans up unused /area paths
 2018-02-17 09:57:18 -06:00
LetterJay
7b87214309 Merge pull request #5537 from Citadel-Station-13/upstream-merge-35717 
[MIRROR] Fixes AI dating
 2018-02-17 09:56:40 -06:00
vuonojenmustaturska
22fb75d2a6 Merge pull request #35735 from coiax/fire-proof-hands 
RESISTHOT species can put out fires with their hands
 2018-02-17 09:39:29 -06:00
vuonojenmustaturska
7214836012 Merge pull request #35734 from ShizCalev/path-cleanup 
Cleans up unused /area paths
 2018-02-17 09:39:20 -06:00
Jordan Brown
cbb11e81e6 Merge pull request #35717 from AnturK/robolove 
Fixes AI dating
 2018-02-17 00:48:26 -06:00
Jordan Brown
48f6e72293 Merge pull request #35716 from AnturK/slipspace 
Fixes wet space.
 2018-02-17 00:48:18 -06:00
BordListian
24ab7e0a84 Adds rainbow slime clusterbangs (#35707) 
* - slime
- yes

* - Adds a volatile reaction

* - There is no escape from the standards that live within
- Can't wait for the experimentor review
 2018-02-17 00:47:03 -06:00
AnturK
3e12e1b2f6 Some antag fixes. (#35690) 
* Removes misleading comment

* Fixes devil ascension visible in lobby

* Fixes nuke op reinforcements.

* ADVANCED COPYPASTE

* Missed this one.
 2018-02-16 10:35:55 -06:00
deathride58
a3180b0173 Merge pull request #5506 from Citadel-Station-13/upstream-merge-35431 
[MIRROR] html_interface removal and crew monitoring console refactor.
 2018-02-16 14:27:26 +00:00
deathride58
a2ae777a5a Merge pull request #5524 from Citadel-Station-13/upstream-merge-35629 
[MIRROR] Converts floor tool interactions to tool_act, fixes flooring exploits
 2018-02-16 14:16:23 +00:00
LetterJay
ad8bab3fc1 Merge pull request #5519 from Citadel-Station-13/upstream-merge-35484 
[MIRROR] Converting more auto_custom antagonists.
 2018-02-16 07:55:29 -06:00
LetterJay
84f12df08e Update weldingtool.dm 2018-02-16 07:54:39 -06:00
LetterJay
8b1e818b2d Update singularityhammer.dm 2018-02-16 07:54:19 -06:00
LetterJay
420f889c9d Update phazon.dm 2018-02-16 07:54:10 -06:00
LetterJay
1983e62c1b Update durand.dm 2018-02-16 07:54:03 -06:00
LetterJay
8b2e073841 Update message_server.dm 2018-02-16 07:53:54 -06:00
vuonojenmustaturska
5ea2e57419 Merge pull request #35629 from ShizCalev/floor-tool_acts 
Converts floor tool interactions to tool_act, fixes flooring exploits
 2018-02-16 06:07:19 -06:00
AnturK
993f15a415 Converting more auto_custom antagonists. (#35484) 
* Thinning out auto_custom uses.

* Not sure what i was thinking.

* Not sure what happened here.

* Fixes

* Forgot i'm doing this so i can remove this

* C

* Valentine antag datums

* This is what i get for adding it manually.
 2018-02-16 00:45:20 -06:00
vuonojenmustaturska
6dfa89fab7 Removes on_mob_turn, on_mob_move and intercept_user_move, speeding up movement (#35679) 
* honk

* qdel memes
 2018-02-16 00:41:04 -06:00
Jordan Brown
f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
deathride58
c1b3253b8d Merge pull request #5485 from Poojawa/cryopods 
Cryopods from Oracle Station
 2018-02-16 05:56:34 +00:00
LetterJay
14d387fa04 Merge pull request #5513 from Citadel-Station-13/upstream-merge-35542 
[MIRROR] Cleans up some duplicate canusetopic warnings
 2018-02-15 22:17:54 -06:00
deathride58
f664c21aee Merge pull request #5502 from Citadel-Station-13/upstream-merge-35586 
[MIRROR] Cleans up remnant traitor cyborg code and AI hacking.
 2018-02-16 03:04:35 +00:00
oranges
5dc3549801 Merge pull request #35542 from ShizCalev/free-spam-removal 
Cleans up some duplicate canusetopic warnings
 2018-02-15 20:35:03 -06:00
deathride58
05ab5f7c0c Merge pull request #5510 from Citadel-Station-13/upstream-merge-35552 
[MIRROR] [s]Fixes writing bugs/exploits
 2018-02-16 01:32:23 +00:00
deathride58
a6ac0df5c4 Merge pull request #5504 from Citadel-Station-13/upstream-merge-35651 
[MIRROR] Gives eggbox an inhand image, cleans up heartbox inhands
 2018-02-16 01:28:54 +00:00
deathride58
ee004e3359 Merge pull request #5503 from Citadel-Station-13/upstream-merge-35655 
[MIRROR] fixes firedoor layer for the last god damn time
 2018-02-16 01:28:35 +00:00
deathride58
91a2c04f0d Update law.dm 2018-02-15 20:27:36 -05:00
deathride58
efa1f99f9d Merge pull request #5495 from Citadel-Station-13/upstream-merge-35548 
[MIRROR] Slime Radio Potion
 2018-02-16 01:12:07 +00:00
deathride58
22398affc5 Merge pull request #5493 from Citadel-Station-13/upstream-merge-35661 
[MIRROR] Mekhi goes on the table
 2018-02-16 01:10:46 +00:00
deathride58
3dac047801 Update implanter.dm 2018-02-15 20:09:30 -05:00
ShizCalev
98bbfb8709 [s]Fixes writing bugs/exploits 2018-02-15 16:10:03 -06:00
AnturK
35b8e410be html_interface removal and crew monitoring console refactor. 2018-02-15 14:31:27 -06:00
TehZombehz
326238e59f Gives eggbox an inhand image, cleans up heartbox inhands 2018-02-15 14:23:48 -06:00
Jordan Brown
1b8a0232c0 Merge pull request #35655 from ShizCalev/DOOR-LAYERING-FIX-FINALE 
fixes firedoor layer for the last god damn time
 2018-02-15 10:40:13 -06:00
AnturK
10a40524ab Cleans up remnant traitor cyborg code and AI hacking. 2018-02-15 10:40:04 -06:00
KorPhaeron
0ed0abbd4c Slime Radio Potion (#35548) 
* Slime Radio Potion

* Deletes inaccurate comment
 2018-02-15 10:38:59 -06:00