shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,311 Commits 5 Branches 0 Tags
d2d9cd7fc2a80bc7d4e4e8a7f4df2c5fdf5149e0
Commit Graph

76 Commits

Author SHA1 Message Date
XDTM
988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00
kevinz000
66c66f0bd7 [READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on 2017-12-03 15:33:29 -06:00
Cruix
b23c92b056 Added bot path data huds 2017-11-28 06:28:40 -06:00
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
vuonojenmustaturska
6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
LetterJay
286442cf4a Merge pull request #3833 from Citadel-Station-13/upstream-merge-32183 
[MIRROR] Ling datum antag standarization.
 2017-11-15 15:00:46 -06:00
LetterJay
0885c57b39 Update mob.dm 2017-11-14 16:10:46 -06:00
vuonojenmustaturska
8136148303 Minor speedups to movement: First Blood Part 2 2017-11-14 15:00:45 -06:00
LetterJay
14944d8711 Merge branch 'master' into upstream-merge-32183 2017-11-12 23:09:55 -06:00
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
AnturK
2e0aaf8598 Ling datum antag standarization. 2017-11-05 19:32:59 -06:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
vuonojenmustaturska
53c9c16fe3 one more thing to allow more mobs to qdel nicely (#32168) 2017-10-29 07:14:44 -05:00
deathride58
e7c69850a1 Wait shit what am i doing - fixes voreverbs proper 2017-10-26 14:31:55 -04:00
LetterJay
dd53de8859 Update mob.dm 2017-10-23 14:15:43 -05:00
Jordan Brown
c51edc3bcd Removes duplicate typecaches 2017-10-23 08:25:30 -05:00
CitadelStationBot
adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00
CitadelStationBot
f19665e698 [MIRROR] Fixes another stack overflow in pull code (#3515) 
* Merge pull request #31905 from AnturK/anotherloop

Fixes another stack overflow in pull code

* Fixes another stack overflow in pull code
 2017-10-20 01:42:18 -05:00
kevinz000
0aa2e6b6a2 Adds type checks to HUD alert clicks to prevent ghosts from causing runtimes (#31609) 
* Update alert.dm

* better fix
 2017-10-19 02:01:14 -05:00
XDTM
7a0ce217db Refactors virus spreading 2017-10-09 08:55:57 -05:00
oranges
cedb56af1b Merge pull request #31302 from ninjanomnom/shuttle-rotation 
Move shuttleRotate into the shuttle module
 2017-10-05 03:05:32 -05:00
KorPhaeron
3e26e09db8 ismecha define 2017-10-02 01:04:53 -05:00
LetterJay
40f541b9da Merge pull request #3031 from Citadel-Station-13/upstream-merge-31117 
[MIRROR] Fixes liches losing spells
 2017-10-01 15:42:12 -04:00
LetterJay
6a8ca2e02c Merge branch 'master' into upstream-merge-31037 2017-10-01 02:53:03 -04:00
AnturK
6411e25110 Fixes liches losing spells 2017-09-30 14:54:02 -05:00
Jordan Brown
7621d1da91 Movement delay fixes and optimization 2017-09-28 21:56:52 -05:00
Jordan Brown
e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
LetterJay
935ae98f4a Merge branch 'master' into upstream-merge-29839 2017-09-11 18:03:51 -05:00
Kyle Spier-Swenson
8e0ef4f38f num2text the Instances number (#30509) 2017-09-09 14:24:24 -05:00
Jordan Brown
92b78d3298 [s] Adds a security token to all admin hrefs 2017-09-08 21:16:02 -05:00
LetterJay
8299cf576c this sure was FUN 2017-09-07 09:47:56 -05:00
CitadelStationBot
605963d45c AltClick Improvements 2017-08-29 17:15:12 -05:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
LetterJay
a0cf777040 Merge branch 'master' into upstream-merge-29940 2017-08-21 23:29:24 -05:00
CitadelStationBot
87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot
2a2e4b2af4 Improves attack logging of pulling / grabbing / throwing 2017-08-17 09:19:05 -05:00
kevinz000
bbcad2fa58 Proper mirror PR for the disease refactor because I fucked up the first one. (#2026) 
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)"

This reverts commit 44742cb115.

* Delete shuttle_loan.dm.rej

* Delete life.dm.rej

* Update life.dm

* Delete life.dm.rej

* compile
 2017-07-31 23:41:22 -07:00
CitadelStationBot
a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
kevinz000
44742cb115 im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025) 
* Revert "Automatic changelog generation for PR #2021 [ci skip]"

This reverts commit 9d0cd37dd3.

* Revert "Disease Refactor (#2021)"

This reverts commit f2ac487927.
 2017-07-15 11:41:36 -07:00
CitadelStationBot
f2ac487927 Disease Refactor (#2021) 2017-07-15 11:40:49 -07:00
CitadelStationBot
ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot
989b991b05 Adds framework for equip delays and adds it to the straight jacket 2017-06-19 22:06:18 -05:00
CitadelStationBot
9ba274a3da Fixes MC panel Location not working while inside containers 2017-06-13 02:45:50 -05:00
CitadelStationBot
a430e24555 Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2017-05-18 16:38:09 -05:00
CitadelStationBot
c61bb0476f [MIRROR] Cleans up some Initializes (#943) 
* Cleans up some Initializes

* Update farm_animals.dm

* Delete farm_animals.dm.rej

* Update farm_animals.dm
 2017-05-18 11:13:53 -05:00
CitadelStationBot
6617f68604 [MIRROR] Harvesters are more fun to play (#894) 
* Harvesters are more fun to play

* resolve .rej
 2017-05-18 07:12:29 -05:00
CitadelStationBot
43c05ad3da [MIRROR] Fixes status stat panel (#878) 
* Fixes status stat panel

* Update mob.dm

* Delete mob.dm.rej
 2017-05-18 06:12:18 -05:00