Commit Graph

33335 Commits

Author SHA1 Message Date
Spades
4579aed0ed Merge pull request #4499 from VOREStation/aro-darkphoto
Combine photosensitive trait with darksight
2018-12-02 13:54:08 -05:00
Spades
822a9eff0e Merge pull request #4500 from lm40/master
Adds Kenzie's hypospray
2018-12-01 12:29:53 -05:00
Spades
ff0ed7d103 Merge pull request #4490 from HungryMoth/BugLanguage
Gives Vasilissans a language finally / Bug-Speak
2018-12-01 11:02:20 -05:00
HungryMoth
8b56ee84a9 Removed Sol Common from Vasi's 2018-11-30 23:16:24 -05:00
HungryMoth
8c1d835b38 Gives Vasilissans the language by default 2018-11-27 13:41:44 -05:00
HungryMoth
3ce47937a4 Updated Lore for Vasilissans 2018-11-27 13:36:52 -05:00
Spades
15017e893e Merge pull request #4493 from Screemonster/gardenstorespecial
Unwhitelists Alraune
2018-11-26 09:08:43 -05:00
Spades
5f3485c48f Merge pull request #4492 from Verkister/yalldumphungry
Some trash eater tweaks and additions.
2018-11-26 09:08:00 -05:00
Spades
0468b18e7a Merge pull request #4484 from VOREStation/permits-updates
Updates permits, adds Ace's pistol
2018-11-26 09:03:38 -05:00
Spades
c8b50f7a67 Merge pull request #4475 from Novacat/nova-weapons
Weapons Tweaks and Sprites
2018-11-26 09:02:55 -05:00
Spades
572363c628 Merge pull request #4443 from Novacat/nova-ert
Splits first aid kit spawning
2018-11-26 09:01:25 -05:00
Spades
cca310a2d6 Merge pull request #4351 from Screemonster/nogurgletheblurble
Makes promethean cores indigestible
2018-11-26 08:59:28 -05:00
Unknown
19efdc84dc Improved Holdout Description 2018-11-25 17:33:04 -05:00
Verkister
9d9865a27a Makes owned PDAs edible only if the owner is watching.
-Prevents folks from just going ham on random lost&founds or SSD loot.
2018-11-14 13:01:56 +02:00
Verkister
2330c21461 Stronger uplink abuse prevention.
-Now also notifies admins whenever someone attempts to commit trait abuse to find or hide uplinks.
2018-11-13 12:30:39 +02:00
lm40
d11c036733 fixed icon 2018-11-12 20:02:40 -05:00
lm40
79f92e4f20 added kenzie's hypospray 2018-11-12 19:33:34 -05:00
Arokha Sieyes
f3bfc1c489 Combine photosensitive trait with darksight 2018-11-12 16:46:55 -05:00
Verkister
c1ac36e0dc Little anti-sumggling tweaks.
-Excludes all uplink enabled items from ingestion with a warning message.
-Excludes boots containing items (knives and such) from ingestion with a warning message.
-Removes a redundant PDA contamination blurb.
-Doubles the time delay it takes to swallow an owned PDA after initiating the action.
2018-11-12 13:25:55 +02:00
Aronai Sieyes
2455d4b84e Merge pull request #4487 from VOREStation/upstream-merge-5730
[MIRROR] Adds Autolathe Cost to Knuckledusters
2018-11-11 12:55:11 -05:00
Aronai Sieyes
f542c51194 Merge pull request #4486 from VOREStation/upstream-merge-5706
[MIRROR] Hail tweaks
2018-11-11 12:54:58 -05:00
Aronai Sieyes
e97e1f3999 Merge pull request #4485 from VOREStation/upstream-merge-5689
[MIRROR] Remplace pills made by the condimaster with bouillon cubes.
2018-11-11 12:54:50 -05:00
Aronai Sieyes
9334850388 Merge pull request #4479 from VOREStation/upstream-merge-5733
[MIRROR] Fixes Area Initialization
2018-11-11 12:54:25 -05:00
Screemonster
13559450d2 spread the seeds 2018-11-11 12:52:16 +00:00
Verkister
a7347765df Reverts contamination disabling all PDA functionality. 2018-11-11 13:55:12 +02:00
Verkister
f0cd597b49 Some trash eater tweaks and additions.
-Adds a bunch of new low exploitability stuff to the garbo snack menu for suggested scene/fun shenanigans. (small non-storage gear (hat/mask/glasses/gloves/shoes), PDA, headset, organs, more toys, bones, broken emags, busted circuitry, lighters, bottles, lifecrystal cases)
-The PDAs give a warning and a delay time if owned, and come with an additional confirmation popup if they also contain an ID.

-Also fixed a bug that would cause "partially-digested" PDAs to forget the existence their IDs and thus make them unrecoverable until the PDA is deleted. (introduced by the gradual gurgles update)
2018-11-11 13:47:05 +02:00
HungryMoth
48509737c6 Update station_vr.dm 2018-11-10 17:21:38 -05:00
HungryMoth
6ced431d0f Update stylesheet.dm 2018-11-10 17:16:58 -05:00
HungryMoth
c3d9f5ff0a Update species_languages_vr.dm 2018-11-10 17:15:51 -05:00
Anewbe
fa9c8abea0 Merge pull request #5730 from Nalarac/patch-2
Adds Autolathe Cost to Knuckledusters
2018-11-09 22:05:35 -05:00
Anewbe
87e428d29e Merge pull request #5706 from VOREStation/aro-hail
Hail tweaks
2018-11-09 22:03:21 -05:00
Kates
2e778f1c09 Remplace pills made by the condimaster with bouillon cubes. (#5689)
* Remplace pills made by the condimaster with bouillon cubes.
Just a couple lines remplace so the condimaster can create pills which look like bouillon cubes (monkey cubes)
The .DMI change is just me adding the monkey cube sprite with a different name. It was fair easier than to have the template look into another file for the icon.

* Remove duplicates

* Fix names being redundant

* Add a description for ze pill.
2018-11-09 22:03:10 -05:00
Spades
0f2a17b3bc Fixes error, also slightly alphabetizes a file
custom_boxes_vr.dm
2018-11-09 20:16:30 -05:00
Spades
129a289052 Updates permits, adds Ace's pistol
- Fixed some permit stuff.
- Removed expired permits and associated items.
- Added Ace's pistol plus a spare mag.
- Locked items to brig access, covering warden, HoS, and Captain, but
not roles like HoP. I think.
2018-11-09 20:06:01 -05:00
Wickedtemp
858dbd6ddf Allows for Whitelst
As per the SCA for Tempest being approved, and so Zal doesn't have to manually add it to their character every time they log in.
2018-11-06 22:05:12 -06:00
Unknown
97c5771625 8 Shots Phaser, 4 shots holdout
- Also halves power usage for stun options on both the martin and the holdout
2018-11-05 19:12:45 -05:00
Aronai Sieyes
3b5b03e05b Merge pull request #4471 from VOREStation/upstream-merge-5701
[MIRROR] Update silicon manifest to discord dark theme.
2018-11-05 15:25:41 -05:00
Arokha Sieyes
d50e2d9deb Edit mapped in HoS armor
It was edited on the map to have pretty incredible armor values, better than SWAT armor, even. Things like this shouldn't be edited in the dmm files. Hard to have oversight on things like that.
Moved the armor values to the code and out of the map, and adjusted them to be more reasonable after discussing with other admins.
2018-11-04 22:51:32 -05:00
Anewbe
eb54117edf Merge pull request #5733 from Neerti/area_initialize_fix
Fixes Area Initialization
2018-11-04 18:42:42 -05:00
Unknown
b974aa763a Renames normal to lethal on phasers 2018-11-02 15:59:13 -04:00
Aronai Sieyes
848e7dd000 Undo phase damage changes 2018-11-02 15:19:44 -04:00
Unknown
635027a425 Removes a frontier phaser from the locker 2018-11-02 15:02:57 -04:00
Unknown
36ea7c4968 Removes AEG change 2018-11-02 14:24:05 -04:00
Unknown
6d928db859 Sprite swap for low power/stun
Red = High Power, Blue = Low Power, Yellow = Stun
2018-11-02 12:54:51 -04:00
Unknown
f67de7bc84 Weapons Balance and Sprites
- AEG now has 10 lethal shots
- Phase weapons bonus damage to animals removed
- Phase weapons now do real damage
- Charge cost bug fixed with phaser
- Overhauled sprite for holdout phaser
- Added Phaser Carbine, right now just a reskinned phaser
- One phaser carbine added to the Pathfinder's locker
2018-11-02 12:31:22 -04:00
Aronai Sieyes
096400b312 Merge pull request #4470 from VOREStation/upstream-merge-5698
[MIRROR] Prometheans can process blood without exploding.
2018-11-01 00:22:04 -04:00
Aronai Sieyes
425616a91b Fix vs edit conflict 2018-11-01 00:01:27 -04:00
Aronai Sieyes
00c3e88542 Merge pull request #4469 from VOREStation/upstream-merge-5662
[MIRROR] Biogenerator improvements.
2018-10-31 23:59:20 -04:00
Aronai Sieyes
2b5e073137 Merge pull request #4468 from VOREStation/upstream-merge-5705
[MIRROR] Fix adminhelp sound toggle respect
2018-10-31 23:58:54 -04:00
Aronai Sieyes
8ac7ad274f Merge pull request #4467 from VOREStation/upstream-merge-5691
[MIRROR] Remplace the plant clippers with a pair hedgetrimmers
2018-10-31 23:58:23 -04:00