shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,664 Commits 5 Branches 0 Tags
a7ec44bfccd29bbd9a96fd0d2fe8dbfadf42e72f
Commit Graph

221 Commits

Author SHA1 Message Date
LetterJay
36a5b861f6 Merge pull request #4754 from Citadel-Station-13/upstream-merge-34216 
[MIRROR] Adds Display Name Argument to Techweb Logging
 2018-01-11 15:15:54 -06:00
ExcessiveUseOfCobblestone
af4f017b93 Adds Display Name Argument to Techweb Logging (#34216) 
* Update _techweb.dm

* Replaces ID with the name of the tech web

* REVERT ON THE WEBBITOR

* Webbitor Blues

* removes "
 2018-01-11 07:40:11 -06:00
Tad Hardesty
149542ca26 Replace CentComm with CentCom in deadchat message (#34249) 2018-01-11 07:39:52 -06:00
oranges
1f88c0c660 [READY]Cargo Update: Nanotrasen Supply Drop Pods! 2018-01-10 03:12:07 -06:00
deathride58
e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
Jordan Brown
f9f6bae65d Merge pull request #34129 from MrDoomBringer/eminem 
Adds package wrapping to autolathes
 2018-01-07 20:07:00 -06:00
deathride58
aabbbb9dff aaaand the rest of the modules folder 2018-01-04 01:45:38 -05:00
LetterJay
30d4b25aee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 2018-01-01 14:09:07 -06:00
LetterJay
4599680f68 Merge pull request #4580 from Citadel-Station-13/upstream-merge-33842 
[MIRROR] Internal radio implant
 2017-12-30 05:03:48 -06:00
Tad Hardesty
0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
coiax
866318e33e Internal radio implant 2017-12-29 02:52:24 -06:00
LetterJay
518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783 
# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm
 2017-12-29 01:34:17 -06:00
Jordan Brown
df080960d4 Merge pull request #33888 from optimumtact/dothefandangomistersantiago 
relic teleport no longer recursively calls itself
 2017-12-27 19:32:26 -06:00
Tad Hardesty
e87c591927 Maybe make R&D console icons load faster (#33749) 
* Maybe make design icons load faster

* Move design icon generation to asset_cache file
 2017-12-27 00:06:08 -06:00
deathride58
dc0e3a89d5 Merge pull request #4523 from Citadel-Station-13/kevinz000-patch-3 
readds shock collars
 2017-12-26 22:10:09 +00:00
kevinz000
b0f793f435 gives medical some medical boards, but not their own circuit imprinter yet (#33816) 
* medical gets med boards

* sleepers/cryo too
 2017-12-25 16:42:18 -06:00
kevinz000
cab61abc32 Update autolathe_designs.dm 2017-12-24 23:29:33 -08:00
kevinz000
30bc560972 readds shock collars 2017-12-24 21:48:06 -08:00
kevinz000
a82d0e13ce Fixes RND 2017-12-22 00:58:46 -08:00
LetterJay
087c43ab71 Update rdmachines.dm 2017-12-21 12:44:59 -06:00
LetterJay
2d995e3f5a Update rdconsole.dm 2017-12-21 12:44:16 -06:00
LetterJay
8e6c8fc8b5 Update departmental_lathe.dm 2017-12-21 12:43:21 -06:00
LetterJay
6573aa52e4 Update departmental_circuit_imprinter.dm 2017-12-21 12:42:18 -06:00
LetterJay
3973b368de Merge branch 'master' into upstream-merge-33470 2017-12-21 03:24:03 -06:00
jughu
2c4e5bae9e Fixes grammer issue (#33679) 2017-12-20 12:02:25 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
ACCount
522b8383d8 [READY]Refactors reagent container types 2017-12-18 22:54:51 -06:00
LetterJay
bd1c186111 Merge pull request #4377 from Citadel-Station-13/upstream-merge-33181 
[MIRROR] All-In-One grinder results are now defined by type, not by huge lists
 2017-12-17 21:26:08 -06:00
LetterJay
3895eb9eac Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519 
[MIRROR] Finishes the forceMove port
 2017-12-17 20:28:07 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
deathride58
ebf0817c76 Merge pull request #4338 from Citadel-Station-13/upstream-merge-33468 
[MIRROR] Designs now default to department flag ALL instead of NONE
 2017-12-15 04:21:56 +00:00
Ashe Higgs
2aef00daf0 All-In-One grinder results are now defined by type, not by huge lists 2017-12-14 15:48:39 -06:00
vuonojenmustaturska
fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
deathride58
7b4e1b2e6b Update designs.dm 2017-12-14 14:38:10 -05:00
Epoc
b2f24a3773 Adds Cybernetic Lungs to cyber_organs techweb node (#33490) 2017-12-13 22:09:56 -06:00
deathride58
7ca4a29cac Merge pull request #4354 from Citadel-Station-13/upstream-merge-33465 
[MIRROR] Replaces a bunch of loc assignments with forcemoves and moves to nullspace
 2017-12-14 03:54:31 +00:00
deathride58
2e83779018 Update destructive_analyzer.dm 2017-12-13 16:49:05 -05:00
Leo
51cce087d8 Fixes two unrelated runtimes 2017-12-13 14:12:26 -06:00
vuonojenmustaturska
7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
Jordan Brown
c599e2fbc8 Designs now default to department flag ALL instead of NONE 2017-12-12 13:10:15 -06:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
deathride58
7ca945c96b Merge pull request #4278 from Citadel-Station-13/upstream-merge-33370 
[MIRROR] Fixes certain material containers
 2017-12-08 19:35:43 +00:00
deathride58
665cef7a35 Merge pull request #4260 from Citadel-Station-13/upstream-merge-33231 
[MIRROR] Adds pet carriers
 2017-12-08 18:46:07 +00:00
deathride58
d1490a18ed Update protolathe.dm 2017-12-08 13:42:41 -05:00
deathride58
32cfebfee7 Update circuitprinter.dm 2017-12-08 13:41:26 -05:00
Jordan Brown
dfaa796fc2 Fixes certain material containers 2017-12-08 12:11:46 -06:00
oranges
d619f206c6 Merge pull request #33235 from Fox-McCloud/xenobio-console 
Slime Blueprint Change
 2017-12-08 10:34:13 -06:00
Ashe Higgs
315e1d718a Adds pet carriers 2017-12-08 10:34:05 -06:00