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-13 11:24:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,269 Commits 55 Branches 0 Tags
eb9e27a497d68e3a433059cb15a7d39d2136b4fc
Commit Graph

99 Commits

Author SHA1 Message Date
Lin
6aa6eaafe6 Merge branch 'master' into abductor-update 2019-11-15 23:24:51 +00:00
kevinz000
dfa2296758 Merge pull request #9430 from Ghommie/Ghommie-cit220 
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
 2019-11-14 15:44:59 -07:00
Lin
df051186eb Merge branch 'master' into abductor-update 2019-11-11 00:08:59 +00:00
Ghommie
b653595702 Ports "Replaces the rpg loot datum with a component and makes some suffixes have real effects" & co 2019-10-31 22:40:11 +01:00
Ghommie
b17346a44e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit220 2019-10-30 14:46:42 +01:00
Linzolle
9250b1c103 big uppdate season 2019-10-23 21:08:47 -05:00
YakumoChen
61bc735ee7 remove gatling laser 2019-10-20 03:07:23 +00:00
Ghommie
689136fe94 Nerfs cyborg disabler to hold 25 shots rather than 43, just like a normal disabler. 2019-10-09 23:07:39 +02:00
Ghommie
5232728ee7 Ports "Adds three new .38 ammo types", also lazily adding .357 AP 2019-10-07 05:25:47 +02:00
kevinz000
6e55fec7bd Merge pull request #9189 from Sishen1542/gatling 
[READY] craftable laser minigun, because why not
 2019-09-28 00:40:02 -07:00
Sishen
a3967b6f77 aaaaaaaa 2019-09-03 02:29:08 -04:00
Sishen
ba5021af5b gives lasrifle the damage component, turns kevs divine lightblade into a hypereut to balance stats, adds hypertool 2019-08-31 02:55:29 -04:00
Sishen
47ee3a8a6d fuck 2019-08-28 23:56:08 -04:00
Sishen
20f4e260e1 minigun ooga 2019-08-23 19:39:20 -04:00
kevinz000
b52462de0d Merge pull request #8958 from Trilbyspaceclone/emitter_gun 
Makes a new traitor Emitter gun for Engi memes
 2019-08-01 23:29:10 -07:00
Trilbyspaceclone
f9dfe5ae97 Update special.dm 2019-07-29 07:53:11 -04:00
TrilbySpaceClone
13936e97de emiting happyness 2019-07-24 14:40:59 -04:00
Ghommie
7065a86841 Revert "Revert "Fixes rocket launchers, buffing their accuracy etc."" 2019-07-19 22:02:22 +02:00
Ghommie
9081b5b773 Revert "Fixes rocket launchers, buffing their accuracy etc." 
This reverts commit 1c6156dd0e.
 2019-07-08 07:17:49 +02:00
Ghommie
1c6156dd0e Fixes rocket launchers, buffing their accuracy etc. 2019-07-08 06:56:20 +02:00
Ghommie
f39a5d2f6a Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix. 2019-06-30 21:53:33 +02:00
Fermi
88ec4e336e Small oops. 2019-06-20 03:34:49 +01:00
Fermi
e0cada7965 Quick fix for a runtime 2019-06-19 01:08:23 +01:00
Thalpy
1cc0724519 Merge branch 'master' into Dwarf 2019-06-17 12:09:55 +01:00
Fermi
17403bd059 Non-functioning EMP code for review (revert before merging.) 2019-06-13 00:58:54 +01:00
kevinz000
3f34e3c93d Update stun.dm 2019-06-08 03:30:25 -07:00
kevinz000
2f2885f1d6 Merge pull request #8558 from Ghommie/Ghommie-cit35 
Ports in the container_type to reagents flags refactor.
 2019-06-08 01:26:28 -07:00
Ghommie
7aac9e6280 Updates reagents a bit. 2019-06-07 06:27:04 +02:00
Fermi
fd22dbfc0d More fixes. Need to check over merging math. 2019-06-02 03:59:52 +01:00
Fermi
0fa445c153 Fixes and test. 2019-06-02 03:24:01 +01:00
Fermi
3cf3268c76 New non-harmful medicinal darts. 2019-06-01 22:52:03 +01:00
kevinz000
031779a944 32 --> 25 2019-05-27 14:28:17 -07:00
kevinz000
4913f332c7 Update stun.dm 2019-05-27 14:23:29 -07:00
deathride58
7db87db43a fancier throws, fancier bullet casings, fancier window destruction, fancier bottle smashing (#7997) 2019-02-13 21:02:00 -08:00
Ragolution
e390f37998 Adjusts wording for grammar on cryo shotgun dart 
Travis is fucking bullying me.
 2019-01-04 07:36:32 -05:00
Ragolution
5f019696bd Spellcheck 2 Electric Boogaloo 
statis

Misspelling of status.
 2019-01-04 06:52:57 -05:00
deathride58
f385751c4a Brings back nonlethal 38 bullets in a semi-nerfed state, keeps the current lethal variant in as a brand new sec autolathe printable ammo box (#7723) 
* Brings back nonlethal 38 bullets in a semi-nerfed state, adds lethal variant for the c38 bullet available at autolathes

* Im drunk ignore me
 2018-11-16 14:46:54 -08:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
6fa011c1be INTRODUCING KITCHEN GUN (#7508) 2018-09-07 05:40:35 -07:00
deathride58
ac6fddcfb3 Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync 2018-07-05 00:17:44 -04:00
CitadelStationBot
22e56253d0 [MIRROR] Fixes gravity gun runtimes. (#7310) 
* Merge pull request #38867 from AnturK/gravgun

Fixes gravity gun runtimes.

* Fixes gravity gun runtimes.
 2018-07-03 09:14:26 -07:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
Dax Dupont
74932ddce0 Gun overlays 2: Electric boogaloo. (#38003) 
* Reduces selfcharge gun processing/icon work

* More efficient gun overlays, adds old_ratio var

* oh my god it was calling the egun's update_icon?

* percent proc

* Attachment overlay overhaul

* Cut overlays in egun update

* ebow 1000% better overlay management

* Update gun.dm

* Pointless check

* Giving KA and children consistent icon behavior

* Update kinetic_accelerator.dm

* Fixed

* ..() readded

* ..() readded

* ..() readded

* Antur didnt catch this one heck

* Because confusing vars are apparently more maintainable

* Gun overlays 2: Electric boogaloo

* another one

* Chameleon guns are removed

* tentacles everywhere
 2018-05-27 11:41:14 -05:00
LetterJay
0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -05:00
Dax Dupont
0dcd8fb37a Fixes oversight with foam (#37898) 
braaap

TRUE FALSE

false false
 2018-05-18 08:29:48 -05:00
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
Dax Dupont
a8a31c9e4b You can no longer print infinite ammunition. (#37626) 
* You can no longer print infinite ammunition.

* henk

lazy

anus

Reduces .38

Casings now give a tiny bit of metal so the janitor gets a buff

spacing
 2018-05-03 08:45:17 -05:00
Jordan Brown
a9d452a24d Merge pull request #37549 from ShizCalev/bounce_away-fixes 
Resolved var name conflict for bounce_away()
 2018-04-30 12:51:40 -05:00
iksyp
ba4f3c0698 Makes pacifists able to use .50BMG Soporific Rounds (#37506) 
* non lethal .50BMG

* no more spaghetti sauce?

I havent actually tested this
 2018-04-29 10:11:42 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00