cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-12 19:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,434 Commits 55 Branches 0 Tags
cf83d3410b51b6cc14fac3c01d5a8d2f9c263e14
Commit Graph

228 Commits

Author SHA1 Message Date
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
LetterJay
56c2405d35 Merge pull request #1143 from Citadel-Station-13/upstream-merge-27556 
[MIRROR] Sketchin Alt Magazine Sprites
 2017-05-24 08:34:19 -05:00
LetterJay
d995dd2dee Merge pull request #1150 from Citadel-Station-13/upstream-merge-27535 
[MIRROR] Ballistic Weapon/Shotgun Reload Sounds
 2017-05-24 08:33:34 -05:00
CitadelStationBot
25f7f32f37 Auto Rifle Armour Piercing Increase 2017-05-24 05:54:45 -05:00
CitadelStationBot
14427a2b8c Ballistic Weapon/Shotgun Reload Sounds 2017-05-24 05:52:37 -05:00
CitadelStationBot
5fe4c7eb07 Sketchin Alt Magazine Sprites 2017-05-24 00:14:08 -05:00
CitadelStationBot
ab7e9539bd Tactical Energy Gun Unique Sprites 2017-05-24 00:13:03 -05:00
LetterJay
2deead1ab2 Merge pull request #1096 from Citadel-Station-13/upstream-merge-27427 
[MIRROR] Warden Compact Combat Shotgun
 2017-05-23 07:13:52 -05:00
LetterJay
b633ef0991 Merge pull request #1130 from Citadel-Station-13/GangSync 
Syncs all gang related PRs with upstream
 2017-05-23 06:17:29 -05:00
LetterJay
db9f2a6d74 rej cleanup 2017-05-23 06:15:33 -05:00
LetterJay
b85d2ea321 Syncs all gang related PRs with upstream 2017-05-23 06:10:40 -05:00
CitadelStationBot
1d5c29b7b6 Auto Rifle Alt Mag Sprites 2017-05-22 22:16:06 -05:00
LetterJay
e675b3becc var/mine_range 2017-05-22 17:35:40 -05:00
LetterJay
288c072544 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27474 2017-05-22 17:30:31 -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
LetterJay
d1db0044d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27344 2017-05-22 11:52:18 -05:00
CitadelStationBot
9e2d43fd80 KA Pressure Mods are now a traitor miner item 2017-05-22 08:20:07 -05:00
CitadelStationBot
8bc4cf3f41 Warden Compact Combat Shotgun 2017-05-21 22:29:01 -05:00
CitadelStationBot
f43a861d6e Plasma cutters will mine further but will go less distance in open air 2017-05-21 22:27:50 -05:00
CitadelStationBot
312ae2218e [MIRROR] fixes chameleon laser guns blowing up welding tanks for real this time (#1069) 
* fixes chameleon laser guns blowing up welding tanks for real this time

* Delete energy.dm.rej

* Update energy.dm
 2017-05-21 18:30:12 -07: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
c36eee94bd Adds modified syringe guns 2017-05-19 06:25:23 -05:00
CitadelStationBot
a430e24555 Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2017-05-18 16:38:09 -05:00
CitadelStationBot
8bcaa54cbe [MIRROR] Fixes language code ignoring holder restrictions (#858) 
* Fixes language code ignoring holder restrictions

* resolve .rej file.
 2017-05-18 04:13:57 -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
LetterJay
52fa1f314f Merge branch 'master' into upstream-merge-26760 2017-05-14 01:02:26 -04:00
kevinz000
236c91a945 Merge pull request #755 from Citadel-Station-13/upstream-merge-26809 
[MIRROR] Increases pixel projectile angles/accuracy
 2017-05-06 21:59:40 -07:00
CitadelStationBot
8a3b280ede Preliminary tesla projectile refactor (also insults vcordie because I'm mean.) 2017-05-06 10:42:51 -05:00
CitadelStationBot
af41e21623 Increases pixel projectile angles/accuracy 2017-05-04 17:52:37 -05:00
LetterJay
3b8484b52b Merge pull request #579 from Citadel-Station-13/upstream-merge-26129 
[MIRROR] Unorphans the blackbox
 2017-05-02 05:13:49 -05:00
CitadelStationBot
036109de58 Changes a bunch of hrefs to the proper defines 2017-05-02 02:20:07 -05:00
LetterJay
b57a4aa6b4 Merge branch 'master' into upstream-merge-26386 2017-05-01 15:27:25 -05:00
LetterJay
06bfa8770e Merge branch 'master' into upstream-merge-26129 2017-04-29 11:45:37 -05:00
CitadelStationBot
caaf42815a Changes some << to to_chat 2017-04-28 06:14:47 -05:00
CitadelStationBot
fd3fb360df Changes the naming of an ammo to make it more distinct 2017-04-27 09:17:40 -05:00
CitadelStationBot
bcab389ca2 New() goes in the trash, we've gotta Initialize() 2017-04-26 17:15:48 -05:00
CitadelStationBot
bde5d6253a Unorphans the blackbox 2017-04-26 17:05:23 -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
LetterJay
2102b20409 Merge pull request #562 from Citadel-Station-13/upstream-merge-26507 
[MIRROR] Removes a few spawns
 2017-04-25 20:35:42 -05:00
CitadelStationBot
a96ba5aae3 Removes a few spawns 2017-04-25 14:36:18 -05:00