cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 02:44:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,013 Commits 8 Branches 26 Tags
15017e893e0f50a2eef3a0a70307e1644dd31cc6
Commit Graph

21748 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Aronai Sieyes
6578b68adb Merge pull request #4466 from VOREStation/upstream-merge-5665 
[MIRROR] Port some noises from baystation.
 2018-10-31 23:57:57 -04:00
Aronai Sieyes
48308e6393 Merge pull request #4457 from Keekenox/informativename 
add medium angel wing sprites
 2018-10-31 23:47:52 -04:00
Neerti
bcf58840d0 Merge pull request #5701 from lbnesquik/Kates-Ai-Manifest-Fix 
Update silicon manifest to discord dark theme.
 2018-10-30 18:42:47 -04:00
Neerti
feabaafa6e Prometheans can process blood without exploding. 2018-10-30 18:41:34 -04:00
Neerti
8333f3cd0b Merge pull request #5705 from VOREStation/aro-bwoink 
Fix adminhelp sound toggle respect
 2018-10-30 18:38:59 -04:00
Neerti
68d1d5cce9 Merge pull request #5691 from lbnesquik/Kates-Hedgetrimmers-feature 
Remplace the plant clippers with a pair hedgetrimmers
 2018-10-30 18:37:45 -04:00
Neerti
aa13df67fe Merge pull request #5665 from lbnesquik/Kates-Machinery-Port 
Port some noises from baystation.
 2018-10-30 18:36:30 -04:00
Keekenox
1c25ffe12a Switched off unit test 11 because the build had to go out now and there was no time to fix it properly. 
Wingy bois
 2018-10-27 16:07:06 -04:00
Aronai Sieyes
816a5c9a57 Fix mistyped macro and indent 2018-10-25 17:35:42 -04:00
Andrei Jors
9fb6894a07 Brings this over from Citadel. Ignore the CITADEL CHANGE comments. 2018-10-25 17:16:05 -04:00
Atermonera
cab7997b27 Merge pull request #5686 from lbnesquik/Kates-Waistcoast 
Fixes all waistcoast being black when worn in the suit slot
 2018-10-23 15:00:56 -04:00
Aronai Sieyes
6fa54a605f Merge pull request #4438 from Heroman3003/intelligence-levels-2 
Added intelligence levels to some virgo mobs
 2018-10-23 14:03:21 -04:00
Aronai Sieyes
613c789b2e Merge pull request #4434 from Novacat/nova-heterochromia 
Nerfs Cash from Mining Vendor
 2018-10-23 13:12:36 -04:00
Aronai Sieyes
aca8fa397e Merge pull request #4450 from VOREStation/upstream-merge-5692 
[MIRROR] Correctly fix surgery caps selection this time.
 2018-10-23 12:33:29 -04:00
Aronai Sieyes
db37cc6c92 Merge pull request #4449 from VOREStation/upstream-merge-5693 
[MIRROR] Fixes duplication of corpses by holding and then cooking
 2018-10-23 12:33:14 -04:00
Aronai Sieyes
e6441d56a4 Merge pull request #4442 from VOREStation/upstream-merge-5694 
[MIRROR] Fix for duplicated loadout descriptions
 2018-10-23 12:33:04 -04:00
Atermonera
b2e676d216 Merge pull request #5692 from lbnesquik/Kates-Surgery-Fix 
Correctly fix surgery caps selection this time.
 2018-10-22 20:55:18 -04:00