shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,615 Commits 5 Branches 0 Tags
f79ad840b23f72ea512aa7f5e487febaaee527a9
Commit Graph

2596 Commits

Author SHA1 Message Date
Raeschen f79ad840b2 Changes MIN_AGE to be in line with server rule 0 2017-09-30 16:30:36 +01:00
LetterJay df26bdd9cf cleanup 2017-07-14 10:22:43 -05:00
CitadelStationBot eb5cce3b8b Prevents transit turfs from throwing things if it has lattice (#1996) 2017-07-14 03:21:23 -07:00
CitadelStationBot 7c4b887551 Clockwork component icons for tgui will only be generated once (#1995) 2017-07-14 03:21:13 -07:00
CitadelStationBot 03618e7aa4 Raises max lines for piano from 50 to 300 (#1993) 2017-07-14 03:14:07 -07:00
CitadelStationBot 5e079fa54f Welding tools now use overlays for fuel gauges, rather than icons (#1994) 2017-07-14 03:13:55 -07:00
LetterJay 798050317f Merge pull request #1991 from Citadel-Station-13/upstream-merge-28826 
[MIRROR] Adds a 'nemesis faction' system to transforming weapons
 2017-07-13 23:59:06 -05:00
LetterJay 0c6343c3bc Merge pull request #1990 from Citadel-Station-13/upstream-merge-29197 
[MIRROR] Adds a "synthesizer" that's basically a handheld piano
 2017-07-13 23:58:37 -05:00
LetterJay 9d3c4d4702 Merge pull request #1989 from Citadel-Station-13/upstream-merge-29215 
[MIRROR] Replaces ex_act and emp_act numbers with defines
 2017-07-13 23:57:35 -05:00
CitadelStationBot 92c6b7b445 Adds a 'nemesis faction' system to transforming weapons 2017-07-13 17:46:51 -05:00
CitadelStationBot b3f8b2a2d7 Adds a "synthesizer" that's basically a handheld piano 2017-07-13 17:46:46 -05:00
CitadelStationBot 55462ed7d1 Replaces ex_act and emp_act numbers with defines 2017-07-13 17:46:41 -05:00
CitadelStationBot 1da785ffb5 Removes old height parameter from CanPass proc 2017-07-13 17:46:36 -05:00
CitadelStationBot da324257fe [MIRROR] Supermatter code cleanup (#1964) 
* Supermatter code cleanup

* Delete supermatter.dm.rej

* Update supermatter.dm
 2017-07-13 06:38:17 -07:00
CitadelStationBot 2892a3710d [MIRROR] Adds collapsing stone tiles (#1933) 
* Adds collapsing stone tiles

* Update necropolis_gate.dm

* Update necropolis_gate.dm.rej

* Delete necropolis_gate.dm.rej
 2017-07-13 06:38:07 -07:00
CitadelStationBot f893863397 [MIRROR] Refactors speech/communication logging and adds coordinates to speech logs (#1905) 
* Refactors speech/communication logging and adds coordinates to speech logs

* Update clockwork_slab.dm

* Delete clockwork_slab.dm.rej

* Update browserOutput.dm

* Delete browserOutput.dm.rej
 2017-07-13 06:37:51 -07:00
Poojawa 3d895118e7 Fixes missing sound effects 2017-07-12 23:37:46 -05:00
CitadelStationBot 85fa3c0bee [MIRROR] Refactors flightsuit code to hopefully be less dumb (#1975) 
* Refactors flightsuit code to hopefully be less dumb

* Update flightsuit.dm

* Delete flightsuit.dm.rej

* Delete objs.dm.rej

* Delete mob_movement.dm.rej

* Delete carbon_movement.dm.rej

* Update mob_movement.dm

* Update flightsuit.dm

* Update mob_movement.dm

* fix
 2017-07-12 05:24:50 -07:00
CitadelStationBot 2879cd1593 YOU CAN NOW PET BLOBS (#1976) 2017-07-10 22:42:48 -07:00
CitadelStationBot e43af7f1bd [MIRROR] get_edge_target_turf() now finds the proper turf when using diagonal directions (#1972) 
* get_edge_target_turf() now finds the proper turf when using diagonal directions

* Update camera.dm
 2017-07-10 16:15:02 -07:00
CitadelStationBot 059e1ad46b Replaces clockwork component initials with icons (#1971) 2017-07-10 16:14:11 -07:00
CitadelStationBot fcf09e06e0 Allows admins to set messages when they delay the round end (#1965) 2017-07-10 16:13:51 -07:00
CitadelStationBot ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
CitadelStationBot 1b70c06474 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs (#1970) 2017-07-10 16:10:42 -07:00
CitadelStationBot b3c3cf7537 Switches SM squawk to report integrity (#1956) 2017-07-10 06:45:06 -07:00
LetterJay e10760e1a5 Merge pull request #1963 from Citadel-Station-13/upstream-merge-29143 
[MIRROR] Fixes race condition with admin proc calls and load admins
 2017-07-09 23:06:47 -05:00
LetterJay b4eee0a1c4 Merge pull request #1962 from Citadel-Station-13/upstream-merge-29145 
[MIRROR] Updates vending refill packs to reflect additional items added in headphones PR
 2017-07-09 23:06:28 -05:00
LetterJay ff0c889a29 Merge pull request #1961 from Citadel-Station-13/upstream-merge-29140 
[MIRROR] Removes now-unnecessary obj_integrity definitions
 2017-07-09 23:06:13 -05:00
LetterJay 08e044a522 Merge pull request #1960 from Citadel-Station-13/upstream-merge-29141 
[MIRROR] Necropolis curse mobs no longer fall into chasms
 2017-07-09 23:05:53 -05:00
LetterJay 19f805acc3 Merge pull request #1959 from Citadel-Station-13/upstream-merge-29134 
[MIRROR] Allows drones to switch to/from harm intent
 2017-07-09 23:05:42 -05:00
LetterJay 2a0e31f0f2 Merge pull request #1955 from Citadel-Station-13/upstream-merge-29136 
[MIRROR] Fixes flashbangs stunning for a maximum of 0.3 seconds instead of 6 seconds
 2017-07-09 23:04:45 -05:00
LetterJay 5aa2fe3666 Merge pull request #1954 from Citadel-Station-13/upstream-merge-29127 
[MIRROR] Fixes entire stacks of goliath plates being used on mechs
 2017-07-09 23:04:17 -05:00
LetterJay ebfafc2426 Merge pull request #1953 from Citadel-Station-13/upstream-merge-29139 
[MIRROR] Makes medipens unable to be emptied and then filled with toxins for a hardsuit-piercing OHKO weapon that has the disguise of medical aid
 2017-07-09 23:04:05 -05:00
LetterJay 0e81a33e95 Merge pull request #1946 from Citadel-Station-13/upstream-merge-29106 
[MIRROR] Chasm code cleanup
 2017-07-09 23:03:31 -05:00
CitadelStationBot 060c7b9dec Fixes race condition with admin proc calls and load admins 2017-07-09 19:49:00 -05:00
CitadelStationBot d64469ccda Updates vending refill packs to reflect additional items added in headphones PR 2017-07-09 19:45:53 -05:00
CitadelStationBot 90c2a4f867 Removes now-unnecessary obj_integrity definitions 2017-07-09 19:44:48 -05:00
CitadelStationBot b24f98c1e2 Necropolis curse mobs no longer fall into chasms 2017-07-09 19:44:43 -05:00
CitadelStationBot 0f6ff169aa Allows drones to switch to/from harm intent 2017-07-09 19:44:40 -05:00
CitadelStationBot b770348797 Fixes wrapping objects 2017-07-09 10:14:16 -05:00
CitadelStationBot 5a11f53535 Fixes flashbangs stunning for a maximum of 0.3 seconds instead of 6 seconds 2017-07-09 06:44:49 -05:00
CitadelStationBot 9d85345b6d Fixes entire stacks of goliath plates being used on mechs 2017-07-09 06:44:46 -05:00
CitadelStationBot 08eaad468a Makes medipens unable to be emptied and then filled with toxins for a hardsuit-piercing OHKO weapon that has the disguise of medical aid 2017-07-09 06:43:42 -05:00
CitadelStationBot 4133d62161 [MIRROR] New portable generator icons (#1943) 
* New portable generator icons

* Delete port_gen.dm.rej

* Update port_gen.dm
 2017-07-08 21:50:51 -07:00
LetterJay c5c66777ab Merge pull request #1948 from Citadel-Station-13/upstream-merge-29114 
[MIRROR] Fixes plasma glass merging with normal glass
 2017-07-08 14:33:41 -05:00
LetterJay 73adaf35a9 Merge pull request #1945 from Citadel-Station-13/upstream-merge-29112 
[MIRROR] Reinforced Plasma Glass is more SME-worthy
 2017-07-08 14:33:20 -05:00
LetterJay bef2941681 Merge pull request #1950 from Citadel-Station-13/upstream-merge-29123 
[MIRROR] Refactors catching to use attack_hand
 2017-07-08 14:32:51 -05:00
CitadelStationBot d608741385 Fixes repeated adminhelp message 2017-07-08 13:19:07 -05:00
CitadelStationBot 2d4604c94b Refactors catching to use attack_hand 2017-07-08 13:19:02 -05:00
CitadelStationBot 2d84e09851 Fixes plasma glass merging with normal glass 2017-07-08 09:45:46 -05:00