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

1593 Commits

Author SHA1 Message Date
CitadelStationBot
55462ed7d1 Replaces ex_act and emp_act numbers with defines 2017-07-13 17:46:41 -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
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
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
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
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
CitadelStationBot
060c7b9dec Fixes race condition with admin proc calls and load admins 2017-07-09 19:49:00 -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
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
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
CitadelStationBot
9874978c5c Dreams while sleeping are now slightly longer on average and will contain more possibilities (#1940) 2017-07-07 23:48:49 -07:00
TalkingCactus
44206f3bf7 Update suicide.dm 
just close the game
 2017-07-07 18:50:13 -04:00
LetterJay
29ef7a9338 Merge pull request #1935 from Citadel-Station-13/upstream-merge-29046 
[MIRROR] Adding the mook/wanderer mob for planetstation
 2017-07-07 15:17:45 -05:00
CitadelStationBot
7b52f001ed Adding the mook/wanderer mob for planetstation 2017-07-07 14:16:26 -05:00
CitadelStationBot
b42fb13549 Adds Headphones! 2017-07-07 12:44:47 -05:00
CitadelStationBot
b0cf4a2e37 Removed silicon SM interact message (#1929) 2017-07-07 10:35:55 -07:00
CitadelStationBot
29d2c7b980 Fixes permissions elevation exploit (#1930) 2017-07-07 10:35:17 -07:00
CitadelStationBot
9a4698874f Adds alarm sounds to SM (#1932) 2017-07-07 10:34:58 -07:00
CitadelStationBot
5dd25bda95 Minor Projectile Reflection Refactor (#1926) 2017-07-07 10:33:59 -07:00
CitadelStationBot
be5ad79fa2 Changes SM integrity rounding (#1925) 2017-07-07 10:33:45 -07:00
CitadelStationBot
6145b939fa Fix incorrect call to do_attack_animation (#1920) 2017-07-07 04:47:28 -07:00
LetterJay
ef4befcdd5 Merge pull request #1919 from Citadel-Station-13/upstream-merge-29071 
[MIRROR] Fixes world.internet_address in irc check
 2017-07-06 22:48:06 -05:00
LetterJay
8bfda97c09 Merge pull request #1918 from Citadel-Station-13/upstream-merge-28998 
[MIRROR] Actually fixes wormhole jaunters, and no it was not my fault.
 2017-07-06 22:47:51 -05:00
LetterJay
b87632669e Merge pull request #1917 from Citadel-Station-13/upstream-merge-29061 
[MIRROR] Warp cubes are slightly less instant but way cooler
 2017-07-06 22:47:38 -05:00
LetterJay
0db6b68bed Merge pull request #1915 from Citadel-Station-13/upstream-merge-29068 
[MIRROR] Lowercased computer names
 2017-07-06 22:47:04 -05:00
CitadelStationBot
cbecf48d2c Fixes world.internet_address in irc check 2017-07-06 20:56:24 -05:00
CitadelStationBot
ee830e7dc8 Actually fixes wormhole jaunters, and no it was not my fault. 2017-07-06 20:15:44 -05:00
CitadelStationBot
a101497539 Warp cubes are slightly less instant but way cooler 2017-07-06 20:12:38 -05:00
CitadelStationBot
b6b999b15a Lowercased computer names 2017-07-06 20:09:27 -05:00
CitadelStationBot
5962b622f1 Doubles goonchat scroll snap tolerance 2017-07-06 19:20:36 -05:00
CitadelStationBot
2da7322cca [MIRROR] Gives ghost roles their own assigned_roles (#1887) 
* Gives ghost roles their own assigned_roles

* Update ghost_role_spawners.dm

* Delete ghost_role_spawners.dm.rej
 2017-07-06 14:15:12 -05:00
CitadelStationBot
24e0c88263 Removes the hot variants of necropolis tiles and walls (#1885) 2017-07-06 13:20:38 -05:00
LetterJay
db9b069075 re-adds headpatting (#1903) 2017-07-06 10:29:58 -07:00
LetterJay
dd70580a72 Merge pull request #1901 from Citadel-Station-13/upstream-merge-28992 
[MIRROR] Adds Necropolis curses for cursed items in Necropolis ruins
 2017-07-06 11:22:24 -05:00