Commit Graph

1510 Commits

Author SHA1 Message Date
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
Aronai Sieyes
b3fb7c181d Make more object lists lazy to pay for my sins 2021-07-15 01:20:17 -04:00
MarinaGryphon
d0d8e42edc unify crash_with and stack_trace 2021-07-13 15:46:52 -05:00
Aronai Sieyes
d7a32991eb Move like every clothing icon file 2021-07-09 18:13:28 -04:00
Aronai Sieyes
8bcd31c91e Merge branch 'master' into Arokha/matdefs 2021-07-07 14:29:30 -04:00
Aronai Sieyes
e4b8407fdb Merge pull request #10908 from MarinaGryphon/spannening
Converts visible_message notice spans to look more like emotes
2021-07-05 16:30:03 -04:00
MarinaGryphon
fdd1c5b7d8 Fixes a few issues with brackets being escaped when they shouldn't be. 2021-07-05 10:23:46 -05:00
MarinaGryphon
e41c2ecfd7 first pass (emotification, some \the -> \The) 2021-07-05 09:42:48 -05:00
Aronai Sieyes
b71c7e7271 Use material defines more 2021-07-03 18:18:05 -04:00
Aronai Sieyes
47291e79d3 Merge pull request #10819 from VOREStation/Icons/guns
Swap some guns for Eris ones
2021-07-03 17:13:44 -04:00
Aronai Sieyes
450ab17039 Merge branch 'Icons/guns' of https://github.com/VOREStation/VOREStation into Icons/guns 2021-07-03 16:42:12 -04:00
Aronai Sieyes
6e14329b2d Move stun revolver
Those other PRs fell through I guess
2021-07-03 16:42:09 -04:00
Aronai Sieyes
56c4d7985b Merge pull request #10792 from VOREStation/Arokha/portamed
Eris portable freezer, medical briefcase
2021-07-03 16:26:07 -04:00
Aronai Sieyes
115005077e Implement heroman suggestion 2021-07-03 16:17:20 -04:00
Aronai Sieyes
99874850ba Merge branch 'master' into Icons/guns 2021-07-01 11:04:34 -04:00
Aronai Sieyes
504f9b58f8 Swap some guns for Eris ones
Also give proper inhands for shrink, oliv and gisk and ge_
2021-06-30 10:08:19 -04:00
Aronai Sieyes
4c12504e3b Replace list inputs with tgui_input_list 2021-06-26 10:39:56 -04:00
Novacat
7f5d51a928 Merge pull request #10729 from klaasjared/Netgun-Upgrade
Netgun Upgrade
2021-06-23 12:30:00 -04:00
klaasjared
16c1902b3a Adds the code and icons
Add the required code and icons for the status indicator upgrade on the weapon.
2021-06-22 15:16:37 -04:00
MarinaGryphon
385fa640af Linter diagnostics + bans non-var relative pathing 2021-06-20 18:16:45 -04:00
TheDavestDave
a88766387d stops handbow changes overiding engery bow
I didn't know it existed
2021-06-20 20:16:32 +01:00
Unknown
40b6fa692f Phaser tweaks and bugfixes
-Slightly increases the energy cost of low power phaser modes.
-Fixes a typepath error for unlocked phaser bows
-Fixes a typo in phaser bows
2021-06-19 20:40:41 -04:00
Novacat
8b447d8b1d Merge pull request #10662 from VOREStation/Arokha/lights2
Port current /tg/ lighting system
2021-06-18 00:21:58 -04:00
Aronai Sieyes
05fc5d3758 Fix requested things 2021-06-17 23:52:39 -04:00
Aronai Sieyes
db14882664 Port tg lighting system
Also converts planet lighting to a new system
Too hard to separate out from this PR
2021-06-17 00:18:09 -04:00
Aronai Sieyes
7ec0b43240 VS: Move most/all overlay use to SSoverlays 2021-06-17 00:14:31 -04:00
TheDavestDave
c9c0c77054 adds the phaser handbow
adds a resprited phaser holdout. Instead of a beam it does a bolt that does the exact same damage. it also has no non-taser replacement becuase it needed it's own spirte and I already modded it twice for lethal and low power.
2021-06-15 23:37:51 +01:00
Aronai Sieyes
869520f818 Remove extra asterisks from rune audible messages 2021-05-31 13:13:57 -04:00