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

116 Commits

Author SHA1 Message Date
CitadelStationBot d21766956e [MIRROR] Cleaned up some emag_acts (#2018) 
* Cleaned up some emag_acts

* Delete port_gen.dm.rej

* Update port_gen.dm
 2017-07-15 13:17:56 -07:00
LetterJay dcf957f0b2 adds icons for PDAs by Cecily and the hunter hat (#2015) 
* adds icons for PDAs by Cecily and the hunter hat

* Update cit_hats.dm
 2017-07-15 11:44:26 -07: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 2ae38397c9 removes current method of handling flightsuit pulling (#2023) 2017-07-15 11:40:34 -07:00
CitadelStationBot bd3c3e9de4 Removes the entry in sound.dm for servostep.ogg (#2004) 2017-07-14 19:35:48 -07:00
CitadelStationBot 106cdfc37b [MIRROR] Fixes the maid costume's apron (#2010) 
* Fixes the maid costume's apron

* Delete admins.txt.rej
 2017-07-14 19:29:55 -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 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 90c2a4f867 Removes now-unnecessary obj_integrity definitions 2017-07-09 19:44:48 -05:00
CitadelStationBot b42fb13549 Adds Headphones! 2017-07-07 12:44:47 -05:00
CitadelStationBot 80083bed73 Increases freedom of the freedom suit 2017-07-06 09:46:23 -05:00
Poojawa b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot 82e8b54738 Mesons work on lavaland again (#1802) 2017-07-01 21:21:59 -07:00
CitadelStationBot 0831c68ad3 Lowercases the names of most glasses, changes the thermonocle's description based on its examiner (#1775) 2017-06-30 20:53:24 -07:00
CitadelStationBot 01456fddf1 Fixed small spelling + punctuation errors (#1716) 2017-06-30 20:46:40 -07:00
CitadelStationBot d4c54bb0b5 Ancient Space Station [Space Spawn Ruin] 2017-06-25 11:03:27 -05:00
CitadelStationBot 919f9f0cfc Turns the maid costume's apron into a detachable accessory. 2017-06-24 15:40:03 -05:00
LetterJay d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
CitadelStationBot 989b991b05 Adds framework for equip delays and adds it to the straight jacket 2017-06-19 22:06:18 -05:00
LetterJay 42368581c5 Merge branch 'master' into upstream-merge-26965 2017-06-19 15:39:01 -05:00
LetterJay c877fdb501 Merge branch 'master' into upstream-merge-28046 2017-06-14 13:10:37 -05:00
LetterJay 813bcc2b8d commit 2017-06-14 11:16:54 -05:00
CitadelStationBot b1da43d3f7 Clarification on hardsuit variants in traitor uplink 2017-06-11 08:29:25 -05:00
LetterJay 47687a6d1a cleanup 2017-06-10 09:42:08 -05:00
LetterJay 522b6d917f updates 2017-06-10 09:36:39 -05:00
LetterJay 7189249f66 Merge pull request #1445 from Citadel-Station-13/upstream-merge-28115 
[MIRROR] A large and unasked for  repath and improvement of accessories (formerly ties, but actually armbands and medals)
 2017-06-10 09:01:25 -05:00
LetterJay 8a628cf13f Delete ties.dm 2017-06-10 09:00:08 -05:00
CitadelStationBot d9e3699f88 Ports Goonchat 2017-06-08 16:27:56 -05:00
CitadelStationBot 1658e48bc1 [READY] Gang Points Refactor - Now stored in the gang datum 2017-06-08 14:46:07 -05:00
CitadelStationBot 9725329268 A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) 2017-06-07 03:06:15 -05:00
LetterJay 35b56f3075 Merge branch 'master' into upstream-merge-27773 2017-06-06 09:05:26 -05:00
CitadelStationBot f03aa5e0fa Adds some more syndicate equipment. 2017-06-05 13:50:54 -05:00
CitadelStationBot 159f78efe7 Fixes #27989 : Riot suits no longer hide jumpsuits (#1379) 2017-06-04 09:09:03 -07:00
CitadelStationBot dceafe4122 Adds some silly new meson failure excuses 2017-05-30 11:12:56 -05:00
CitadelStationBot de413c89de Fixes mesons giving the wrong message when toggling off 2017-05-29 06:32:10 -05:00
CitadelStationBot afbfb66386 Splits mining_mobs.dm into separate files 2017-05-29 01:17:13 -05:00
LetterJay 2d41b7fe17 EHHH 2017-05-28 15:49:22 -05:00
LetterJay 42edd006b8 A BUNCH OF SHIT 2017-05-28 14:57:17 -05:00
LetterJay fcb3a53072 Merge pull request #1243 from Citadel-Station-13/upstream-merge-27725 
[MIRROR] Changes incorporeal movement to use defines
 2017-05-28 14:33:22 -05:00
LetterJay 33aae484d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-05-27 22:49:44 -05:00
LetterJay fdb54c3ce3 hat 2017-05-27 22:49:20 -05:00
CitadelStationBot 2cc74f4a8f Changes incorporeal movement to use defines 2017-05-27 20:55:04 -05:00
LetterJay 0137b79f6c Merge pull request #1195 from Citadel-Station-13/upstream-merge-27537 
[MIRROR] Adds goliath cloak & a recipe (Lavaland PvE primitive item)
 2017-05-26 23:22:31 -05:00
CitadelStationBot b089a14c53 Ports guns to Initialize 2017-05-26 19:06:39 -05:00
CitadelStationBot a84bcdd42e Adds goliath cloak & a recipe (Lavaland PvE primitive item) 2017-05-26 11:14:20 -05:00
CitadelStationBot 7d75b70ff0 Renames a var 2017-05-24 16:21:19 -05:00
LetterJay 936e1d3061 Missed during mirror downtime 2017-05-24 08:40:45 -05:00
CitadelStationBot 074b684b4d Armour Description Changes 2017-05-24 00:11:57 -05:00