shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,438 Commits 5 Branches 0 Tags
342fd1d7faf8d343b5d25f333bd0eb63d885e201
Commit Graph

1292 Commits

Author SHA1 Message Date
CitadelStationBot a6d64204ad [MIRROR] Updates PubbyStation (#2325) 
no
 2017-08-22 18:20:46 -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 b01a24c95b my eyes hurt 2017-08-22 01:42:20 -05:00
LetterJay 2241f5ecfb Update cult_items.dm 2017-08-21 23:32:21 -05:00
LetterJay cef534face Update mutations.dm 2017-08-21 23:31:55 -05:00
LetterJay a0cf777040 Merge branch 'master' into upstream-merge-29940 2017-08-21 23:29:24 -05:00
CitadelStationBot b5e7f7f7fe [MIRROR] Adds defines for mouse_opacity (#2381) 
* Adds defines for mouse_opacity

* Delete misc.dm.rej

* Update misc.dm
 2017-08-21 20:29:37 -07:00
CitadelStationBot 4961966552 |SPECIES FOOD PREFERENCES| (#2232) 
* Species food preferences

* sync

* Update humans.dm

* FUCK PUBBY
 2017-08-21 20:23:30 -07:00
kevinz000 7a5497bb40 FUCK (#2452) 
FUCK - Fixes Vending Machines
 2017-08-21 20:12:22 -07:00
LetterJay f2f1474123 Merge pull request #2322 from Citadel-Station-13/upstream-merge-29747 
[MIRROR] Removes a great amount of machinery copypasta with circuitboards.
 2017-08-21 20:32:10 -05:00
LetterJay 83f4733027 Rename _circuitboard.dm to circuitboard.dm 2017-08-21 20:01:59 -05:00
LetterJay 9b049e6f49 Rename machinery.dm to _machinery.dm 2017-08-21 19:42:43 -05:00
CitadelStationBot 772299445e Makes the Ark of the Clockwork Justicar much more fancy 2017-08-20 19:55:15 -05:00
LetterJay ae9e4495f9 Merge branch 'master' into upstream-merge-29747 2017-08-20 09:53:17 -05:00
LetterJay 940f5da5fd Rename _machinery.dm to machinery.dm 2017-08-20 09:52:28 -05:00
LetterJay 08bbe72923 Update portable_turret.dm 2017-08-20 09:50:56 -05:00
LetterJay 0b57bbe184 Update iv_drip.dm 2017-08-20 09:50:22 -05:00
CitadelStationBot eb0235792a Singularities dig up asteroid turf 2017-08-19 18:41:38 -05:00
LetterJay 95cbe66a3a Merge pull request #2362 from Citadel-Station-13/upstream-merge-29870 
[MIRROR] Fixes a typo in the blobbernaut spawn text
 2017-08-18 13:41:37 -05:00
LetterJay 6dd7c44bbc Merge pull request #2361 from Citadel-Station-13/upstream-merge-29829 
[MIRROR] Merges the two turf/Entereds
 2017-08-18 13:41:23 -05:00
LetterJay 19b8a5a380 Merge pull request #2352 from Citadel-Station-13/upstream-merge-29858 
[MIRROR] Fixed sign description
 2017-08-18 13:41:07 -05:00
LetterJay 8a7c0e657f Update powers.dm 2017-08-18 11:20:36 -05:00
LetterJay db3622ca12 Update signs.dm 2017-08-18 11:18:33 -05:00
LetterJay 3c91fba8e3 Update turf.dm 2017-08-18 11:16:30 -05:00
LetterJay 146b5880d5 Merge pull request #2410 from Citadel-Station-13/upstream-merge-29934 
[MIRROR] Fixes leathercrafting recipies trying to build on the floor.
 2017-08-17 10:09:16 -05:00
LetterJay c32595f980 Merge pull request #2399 from Citadel-Station-13/upstream-merge-29820 
[MIRROR] Blobs can now sense loving cuddles!
 2017-08-17 10:07:37 -05:00
LetterJay e44a70c135 Merge pull request #2396 from Citadel-Station-13/upstream-merge-29797 
[MIRROR] Moves most of world.dm
 2017-08-17 10:07:06 -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 72cf7083f6 Fixes leathercrafting recipies trying to build on the floor. 2017-08-17 09:19:09 -05:00
CitadelStationBot 68830dac71 Changes smes, cells, cell charger, terminals and apcs icons 2017-08-16 20:02:24 -05:00
CitadelStationBot 4bd5e318c2 Blobs can now sense loving cuddles! 2017-08-16 18:00:54 -05:00
CitadelStationBot afbe4be50c Moves most of world.dm 2017-08-16 17:51:33 -05:00
CitadelStationBot c2d335b7da [s] Fixes MG turret firing while the user is stunned/cuffed/unconscious 2017-08-16 17:50:28 -05:00
LetterJay 0ffaf66d1f Merge branch 'master' into upstream-merge-29690 2017-08-15 19:18:22 -05:00
LetterJay 865c56afbf Update areas.dm 2017-08-15 19:08:05 -05:00
LetterJay 24be45e6fa Update sound.dm 2017-08-15 18:56:57 -05:00
LetterJay ab27b63cf9 Merge branch 'master' into upstream-merge-29611 2017-08-15 18:55:12 -05:00
LetterJay 41c9cf3a4a Update machinery.dm 2017-08-15 18:53:10 -05:00
CitadelStationBot 3d83b55cf6 Annihilates the colons! 2017-08-15 10:49:55 -05:00
LetterJay 62eee8804e Merge pull request #2337 from Citadel-Station-13/upstream-merge-29815 
[MIRROR] Fixes bad dirs
 2017-08-14 22:18:07 -05:00
LetterJay 31b501aa1a Merge branch 'master' into upstream-merge-29885 2017-08-14 19:41:45 -05:00
LetterJay 64b3fe43d9 Update shieldgen.dm 2017-08-14 19:38:43 -05:00
LetterJay b962876d38 Merge pull request #2371 from Citadel-Station-13/upstream-merge-29868 
[MIRROR] Fixes the Resurrect Cultist rune not working
 2017-08-14 18:53:53 -05:00
LetterJay e5cd79a14e Merge pull request #2373 from Citadel-Station-13/upstream-merge-29854 
[MIRROR] Moved can_trigger_gun to item/weapon parent
 2017-08-14 18:53:38 -05:00
LetterJay 2719f23e52 Update shieldgen.dm 2017-08-14 18:53:01 -05:00
LetterJay 98ff124b68 Update shieldgen.dm 2017-08-14 18:50:44 -05:00
LetterJay 6d62d51eab Merge pull request #2198 from Citadel-Station-13/upstream-merge-29288 
[MIRROR] Hallucinations 3.0
 2017-08-14 18:45:45 -05:00
LetterJay 300fc768a5 Merge pull request #2265 from Citadel-Station-13/upstream-merge-29727 
[MIRROR] The inhands of the Dark Blessing chaplain weapon is now visible.
 2017-08-14 18:37:28 -05:00
LetterJay 1bb5e19596 Merge pull request #2255 from Citadel-Station-13/upstream-merge-29695 
[MIRROR] flora.dm initialize hint
 2017-08-14 18:36:58 -05:00