Commit Graph

1537 Commits

Author SHA1 Message Date
Atermonera
d930b94d34 Merge pull request #8385 from Atermonera/bb
Adds caseless BB rounds for common gun types
2022-01-27 23:09:41 -05:00
Heroman
12546cd5d6 More fixes/adjustments for BSH 2021-12-11 17:46:09 +10:00
VerySoft
cf7d14b2ee You can't eat yourself, charlie brown!
Makes it so you can't eat yourself with the BSH
2021-12-08 13:18:42 -05:00
Heroman
76df8bf18b Post-testing fixes 2021-12-04 19:48:59 +10:00
Heroman
2e29a40ef7 Makes Bluespace Harpoon capable of televore 2021-12-04 15:51:40 +10:00
Casey
c0e6cf8d71 Merge pull request #11831 from Hatterhat/rad-arm
operation RAD APES
2021-11-22 23:44:44 -05:00
Casey
9996cac6f6 Merge pull request #11903 from Heroman3003/offsitefix
Fixes offsite modulator
2021-11-22 23:38:35 -05:00
Heroman
771549d452 Fixes offsite modulator 2021-11-22 18:36:32 +10:00
Atermonera
f3bdc71afb Merge pull request #8344 from Verkister/patch-80
Fixes rocket launcher
2021-11-21 03:04:41 -05:00
Casey
dead3acae1 Merge pull request #11841 from FartMaster69420/somatoray
Somatoray Modularity
2021-11-20 05:46:43 -05:00
FartMaster69420
c9095b673d Cleaning code
Derp, left some unreachable code.
2021-11-19 17:34:10 -05:00
FartMaster69420
16bf6be95e Merge branch 'VOREStation:master' into somatoray 2021-11-19 17:00:21 -05:00
Hatterhat
a4e998854d repaths i forgor 💀 2021-11-18 16:34:03 -06:00
FartMaster69420
83b77c7923 Adding comments 2021-11-16 16:39:54 -05:00
FartMaster69420
40f963ea22 Adds effects to upgrading the Somatoray
The chance of a mutation is now multiplied by the tier of laser used.
2021-11-16 16:28:59 -05:00
VerySoft
2516a17bd4 SD QOL update
Fixes a few map issues.
2021-11-16 01:40:24 -05:00
FartMaster69420
b0804eed80 Somatoray Buff, initial commit
This adds micro laser stock parts as a component to floral somatorays.
2021-11-16 01:24:30 -05:00
Hatterhat
9a4215fddb when the 2021-11-15 19:14:30 -06:00
Hatterhat
029379ec98 making the heater have a reason 2021-11-09 00:04:59 -06:00
Hatterhat
1760663ac0 i forgot to test the KA offsite check lol 2021-11-09 00:02:04 -06:00
Aronai Sieyes
e5346a3920 Merge pull request #11675 from VOREStation/upstream-merge-8250
[MIRROR] Adds unique projectile hit messages to simplemobs
2021-10-27 21:06:41 -04:00
Cerebulon
5d86e5051c Adds unique projectile hit messages to simplemobs (#8250)
* Adds unique hit messages to simplemobs

* decl'd hit lists

* how was that even working

* set decl ref on init
2021-10-27 20:52:55 -04:00
Aronai Sieyes
e1068faac0 Rebase 2021-10-27 20:37:02 -04:00
Casey
226802ff73 Merge pull request #11701 from Hatterhat/tg-ka
ports citrp's KAs, which are a port of citmain's KAs, which are tg's, because i like KAs
2021-10-27 12:00:42 -04:00
Hatterhat
2655ef17c3 machete resize oops, KA heat modulator 2021-10-25 18:36:45 -05:00
Hatterhat
b73457a199 makes KAs usable 2021-10-24 15:30:08 -05:00
MistakeNot4892
fbe933d8a1 Merge pull request #8328 from Atermonera/rockets_that_go_sideways_arent_REALLY_rockets
Rocket launchers make the projectile when they consume the rocket
2021-10-10 05:40:43 -04:00
Hatterhat
bfac91465b Crusher Gaming (#11462)
* [the who - baba o'riley plays in the background]

* i need more POWER

* rewrite pt1

* bug fixo

* uh oh! they're obtainable!

* verbs

* knif

* furthur cleanup

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
2021-08-22 15:18:12 -04:00
klaasjared
7601d77eb0 Base Commit 2021-08-21 02:30:39 -04:00
Aronai Sieyes
1543f926df Fix mysterious conflict 2021-08-19 13:09:28 -04:00
MistakeNot4892
d8ecba95f3 New Shotguns/Rifles 2021-08-19 01:23:03 -04:00
klaasjared
f1ae828b5f Small Fix 2021-08-16 10:29:51 -04:00
klaasjared
c01648b55f Base Commit 2021-08-15 18:00:11 -04:00
Aronai Sieyes
2baf13f632 Merge pull request #11421 from MisterGrimm/XenomorphOverhaul
Fixes ancient corrosive acid problems for player xenomorphs, makes up to eight years worth of content unacidable
2021-08-15 01:02:41 -04:00
Aronai Sieyes
98163fd3fa Fix merge conflicts 2021-08-15 00:50:25 -04:00
Sym
ed7f4b9e75 Fixes corrosive acid, makes most important things unacidable
Makes pretty much anything important to the crew unacidable, fixes how acid interacts with floors.
2021-08-14 10:49:44 -04:00
Schnayy
ceb4488540 Stun Revolver Update 2021-08-13 18:17:21 -04:00
Aronai Sieyes
74fe48d7d4 Merge pull request #11347 from ResidentCody/phoron-bore-shoots-slower
Phoron Bore - Adds Hefty Recoil When Firing
2021-08-06 18:14:30 -04:00
ResidentCody
d0ca33c7cc Update bore.dm 2021-08-05 14:59:33 -06:00
Aronai Sieyes
75c45c1c40 Add/port OP-15 SMART Rifle 2021-08-02 18:02:57 -04:00
Aronai Sieyes
b46edd6245 Paths can be list keys 2021-08-02 17:59:31 -04:00
Aronai Sieyes
34982728cb Add 'as anything' to various for loops 2021-07-20 12:39:59 -04:00
Aronai Sieyes
eb76662be1 Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
Xenomorph Overhaul and fixes from Gurgstation
2021-07-19 21:06:21 -04:00
Aronai Sieyes
1fec055535 Bows do damage 2021-07-19 17:02:35 -04:00
Sym
13950cdd38 Xenomorph Port Gurglestation
Ports Gurglestation Xenomorphs to Virgo.
2021-07-16 18:07:25 -04:00
MarinaGryphon
f5db6b47e8 Catches the rest, unfortunately including some comments. Oh well! 2021-07-16 15:58:57 -05:00
MarinaGryphon
a843667af3 Fixes a bunch of bools missed in #11100 2021-07-16 15:55:49 -05:00
MarinaGryphon
577b986ba6 Convert some bools to TRUE/FALSE instead of 1/0. (#11100)
Co-authored-by: Aronai Sieyes <arokha@arokha.com>
2021-07-16 13:43:25 -04:00
Aronai Sieyes
f0a5f26032 Add a couple bows 2021-07-15 17:52:31 -04:00
Aronai Sieyes
43822f5c50 Merge pull request #11080 from VOREStation/Arokha/bayport
Ports new Bay SolGov suits as Commonwealth suits
2021-07-15 15:02:01 -04:00