shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,028 Commits 5 Branches 0 Tags
360e7b60cfb00a0b8a6484fcc1e51ddb86e5a905
Commit Graph

59 Commits

Author SHA1 Message Date
kevinz000 fcddd32703 Merge pull request #2195 2017-08-29 22:26:58 -07:00
kevinz000 064ade469f sync 2017-08-29 09:35:55 -07:00
kevinz000 498bd61928 sync 2017-08-29 09:12:56 -07:00
LetterJay 6c76ae2395 clean up 2017-08-28 10:34:31 -05:00
LetterJay 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -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
CitadelStationBot 87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot 55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00
CitadelStationBot edf7c03070 Multiple inhand sprites fix 2017-07-30 19:58:18 -05:00
Poojawa b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
Poojawa 789064a3a5 Clean up .rej files 2017-06-28 02:24:03 -05:00
LetterJay e680da7de6 Merge pull request #1770 from Citadel-Station-13/upstream-merge-28584 
[MIRROR] Ancient Space Station [Space Spawn Ruin]
 2017-06-27 21:25:50 -05:00
LetterJay 00925de5f3 Update energy_gun.dm 2017-06-27 12:20:39 -05:00
LetterJay 77295c30d4 Merge pull request #1695 from Citadel-Station-13/upstream-merge-28599 
[MIRROR] Disablers now have an in-hand sprite (Fixes #28582)
 2017-06-26 06:21:50 -05:00
CitadelStationBot d4c54bb0b5 Ancient Space Station [Space Spawn Ruin] 2017-06-25 11:03:27 -05:00
LetterJay d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
CitadelStationBot 8809db8230 Disablers now have an in-hand sprite (Fixes #28582) 2017-06-20 10:31:24 -05:00
LetterJay 4c1b223248 Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync 
Selective mirror sync
 2017-06-14 06:41:01 -05:00
LetterJay 55d30f865b upstream-merge-28062 2017-06-12 12:20:07 -05:00
CitadelStationBot 53229bb7da If you're lucky enough to get multiple lifesteal crystal modkits you can actually make use of them 2017-06-11 08:30:29 -05:00
LetterJay 4624ec7e04 upstream-merge-27899 2017-06-11 00:09:55 -05:00
LetterJay b80a184d97 up to upstream-merge-27868 2017-06-11 00:04:00 -05:00
CitadelStationBot c36e599a6a Fixes AOE modkits not working because I messed up the logic (#1400) 2017-06-04 09:03:45 -07:00
CitadelStationBot cb755fc6d0 Adds three unique kinetic accelerator modules to necropolis chests 2017-06-01 15:32:16 -05:00
CitadelStationBot e9d00c2aff [READY] Adds ability to add bayonets to weapons - Only enabled on kinetic accelerators - refactors gunlight/bayonet sprites to ballistics too (#1191) 2017-05-27 13:36:44 -07:00
CitadelStationBot b089a14c53 Ports guns to Initialize 2017-05-26 19:06:39 -05:00
LetterJay 9befc09252 UAV online 2017-05-24 12:21:14 -05:00
LetterJay c8d071ccf4 25 kill streak with a famas 2017-05-24 12:20:50 -05:00
LetterJay a9aa36e5c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27557 2017-05-24 12:13:44 -05:00
LetterJay 936e1d3061 Missed during mirror downtime 2017-05-24 08:40:45 -05:00
CitadelStationBot ab7e9539bd Tactical Energy Gun Unique Sprites 2017-05-24 00:13:03 -05:00
LetterJay b66b362e4f Merge pull request #1109 from Citadel-Station-13/upstream-merge-27484 
[MIRROR] KA Pressure Mods are now a traitor miner item
 2017-05-22 17:25:47 -05:00
LetterJay 9df8057e0e Merge pull request #1050 from Citadel-Station-13/upstream-merge-27344 
[MIRROR] Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual
 2017-05-22 12:40:18 -05:00
LetterJay 8791ad036f Merge pull request #1045 from Citadel-Station-13/upstream-merge-27268 
[MIRROR] World.dm Refactor
 2017-05-22 12:39:52 -05:00
LetterJay 3548ed5e3e i'll fix this in another PR 2017-05-22 12:27:59 -05:00
CitadelStationBot 9e2d43fd80 KA Pressure Mods are now a traitor miner item 2017-05-22 08:20:07 -05:00
kevinz000 7e2cebe1db Merge branch 'master' into upstream-merge-27344 2017-05-21 17:50:29 -07:00
CitadelStationBot a3807448db Adds framework for kinetic accelerator projectiles having module-based effects on-hit (#1076) 2017-05-21 17:42:06 -07:00
Poojawa 186ed2acbb Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268 2017-05-21 00:44:08 -05:00
Poojawa 45ba084c6a Merge branch 'master' into upstream-merge-27344 2017-05-20 23:26:28 -05:00
CitadelStationBot 461804e635 Pulse Weapons Sprite Update 2017-05-19 13:51:47 -05:00
CitadelStationBot a430e24555 Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2017-05-18 16:38:09 -05:00
CitadelStationBot 257cf986c5 Repaths C4 (#808) 
* Repaths C4

* Delete tgstation.2.1.3.dmm.rej

* Add files via upload

* update CitadelStation-1.2.1.dmm
 2017-05-18 00:37:20 -05:00
CitadelStationBot 036109de58 Changes a bunch of hrefs to the proper defines 2017-05-02 02:20:07 -05:00
CitadelStationBot caaf42815a Changes some << to to_chat 2017-04-28 06:14:47 -05:00
CitadelStationBot a905c15dad Replaces /image with /mutable_appearance (#556) 
* Replaces /image with /mutable_appearance, where appropriate

* Update miscellaneous.dm

* Delete miscellaneous.dm.rej

* Delete pet.dm.rej

* Update pet.dm

* Update species.dm

* Update miscellaneous.dm

* Update species.dm

* Update miscellaneous.dm

* Delete species.dm.rej

* Update species.dm

pretty sure I got all the indentation correct THIS time, ffs

* Update species.dm

* Update species.dm

fucking tabs man, fucking tabs.
 2017-04-26 08:18:35 -05:00
Poojawa 7e9b96a00f April sync (#360) 
* Maps and things no code/icons

* helpers defines globalvars

* Onclick world.dm orphaned_procs

* subsystems

Round vote and shuttle autocall done here too

* datums

* Game folder

* Admin - chatter modules

* clothing - mining

* modular computers - zambies

* client

* mob level 1

* mob stage 2 + simple_animal

* silicons n brains

* mob stage 3 + Alien/Monkey

* human mobs

* icons updated

* some sounds

* emitter y u no commit

* update tgstation.dme

* compile fixes

* travis fixes

Also removes Fast digest mode, because reasons.

* tweaks for travis Mentors are broke again

Also fixes Sizeray guns

* oxygen loss fix for vore code.

* removes unused code

* some code updates

* bulk fixes

* further fixes

* outside things

* whoops.

* Maint bar ported

* GLOBs.
 2017-04-13 23:37:00 -05:00
Poojawa f67e9f6d87 Bleeding edgy refresh (#303) 
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
 2017-03-21 11:44:10 -05:00