cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,534 Commits 5 Branches 0 Tags
123050bcd0022aa9bbd53c7d4de61d25179173f6
Commit Graph

21518 Commits

Author SHA1 Message Date
Repede
123050bcd0 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	code/game/jobs/job/civilian_chaplain.dm
#	code/modules/mob/language/station_vr.dm
 2018-07-08 11:38:06 -04:00
Hawk_v3
c96ed7457c Dewhitelisted Languages, removed Vore duplications 
As station.
Demon is now Daemon.
Angel is Enochian. If you're wondering where your language has gone.
 2018-07-07 18:25:26 +01:00
Aronai Sieyes
a8b9fa86df Merge pull request #3966 from Verkister/killborg 
Fixes sleeperbellies not ejecting contents on borg death.
 2018-07-04 19:37:39 -04:00
Anewbe
af08909d49 Merge pull request #5389 from VOREStation/pol-hypo 
Fix hypospray exploit
 2018-07-04 11:50:55 -04:00
Aronai Sieyes
05989b6aa9 Merge pull request #3971 from VOREStation/upstream-merge-5385 
[MIRROR] Fix handheld Cameras
 2018-07-03 18:52:58 -04:00
Aronai Sieyes
3b306e87f0 Merge pull request #3968 from VOREStation/upstream-merge-5375 
[MIRROR] Adds non-head of staff department cloaks
 2018-07-03 15:43:19 -04:00
Aronai Sieyes
f857592fa0 Basically undo changes 2018-07-03 15:39:58 -04:00
Unknown
b80b736e16 Fixes Imperial Laser too 2018-07-03 10:26:57 -04:00
Anewbe
2be38d8d90 Fix handheld Cameras 2018-07-03 01:23:04 -04:00
Unknown
1dc914063b Fixes USDF Sprites 
Fixes #3967 for Ace
(Unfortunately I have no idea how to fix the imperial weapon sound)
 2018-07-03 01:17:11 -04:00
Anewbe
0c25bf04a0 Merge pull request #5375 from Mewchild/MC-Cloaks 
Adds non-head of staff department cloaks
 2018-07-02 20:32:14 -04:00
Michael Gosselin
1be0089958 Merge remote-tracking branch 'refs/remotes/Repede/master' 2018-07-02 20:25:26 -04:00
Michael Gosselin
0fecc3d6e5 R-UST AI observer fix 
R-UST Core Sempai no longer notices the AI.
 2018-07-02 20:25:23 -04:00
Repede
cbea7f7c1a Nerfs blueshields more, fixes for jackhammer drums. 2018-07-02 11:21:37 -04:00
Verkister
9f36a01985 Fixes sleeperbellies not ejecting contents on borg death. 
-Wow it sure took a while before we found out what was forgotten during the original citadel port.
 2018-07-02 13:28:59 +03:00
Atermonera
308c4b64e0 Renames Taj Sign Language 2018-07-02 00:49:17 -04:00
Aronai Sieyes
bb895947d9 Merge pull request #3950 from VOREStation/upstream-merge-5369 
[MIRROR] Only slimes may squish.
 2018-07-02 00:43:26 -04:00
Aronai Sieyes
c5fc48af3c Merge pull request #3942 from Novacat/nova-heterochromia 
Medical Tweaks
 2018-07-02 00:42:29 -04:00
Aronai Sieyes
2e0e39b627 Merge pull request #3949 from VOREStation/upstream-merge-5361 
[MIRROR] Ports Siik'Tajr from Baystation
 2018-07-02 00:36:20 -04:00
Aronai Sieyes
9a56255686 Merge pull request #3960 from VOREStation/upstream-merge-5379 
[MIRROR] Fixes an infinite drowsyness bug
 2018-07-02 00:32:35 -04:00
Aronai Sieyes
b23aafca9c Comment out change 2018-07-02 00:30:59 -04:00
Arokha Sieyes
ae755b776c Remove the custom Virgo version of siiktajr 2018-07-02 00:21:41 -04:00
Repede
d7124a22cc Jackhammer can only hold 4 rounds instead of 10, sprites changed to reflect that. 2018-07-01 22:16:46 -04:00
Atermonera
9b237d0d5c Merge pull request #5379 from Anewbe/drowsy 
Fixes an infinite drowsyness bug
 2018-07-01 17:56:46 -04:00
Hawk_v3
ee27b03c01 Tyops will be the death of us all. 
I missed a T for Topmounted
 2018-07-01 21:27:35 +01:00
Hawk_v3
5605a87683 Wrapping up the Jackhammer 
Name change possible, but here. All match and are ready.
 2018-06-30 02:42:31 +01:00
Hawk_v3
8aa6aa85bc Merge remote-tracking branch 'upstream/master' 2018-06-29 22:32:22 +01:00
Unknown
14d64a5570 Duplicate PR revert and minor bugfix 
- Reverts Virgo Siik'Tajr, since Polaris decided to implement it upstream
- Fixes a bug that caused the Pathfinder's locker script to instead trigger on explorer lockers
 2018-06-29 16:25:20 -04:00
Layne
a12778d773 Only slimes may squish. (#5369) 
* Clandestine (Original Commit)

* Revert "Clandestine (Original Commit)"

This reverts commit cdb1abb47b3720e9160a4942a06f1b9036db2c27.

* Squish on my slime

* Squish on my slime
 2018-06-29 15:56:20 -04:00
Anewbe
8b813107c1 Merge pull request #5361 from Novacat/spriteadd 
Ports Siik'Tajr from Baystation
 2018-06-29 15:49:56 -04:00
Hawk_v3
b922664afa Forgot to set a name from placeholder. 
Whoops.
 2018-06-29 15:50:44 +01:00
Hawk_v3
9a38e88b9f Blueshield updates. New shotgun. 
Semiauto revolver shotgun for Blueshield and Warden. Sprites are placeholder.

Blueshield spawn gear boxes for weapon choice now.
 2018-06-29 15:03:01 +01:00
Repede
d4bb48b2f6 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Resolved Conflicts:
#	code/game/machinery/cloning.dm
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm
 2018-06-29 09:58:53 -04:00
Verkister
82dd96a141 Adds a bunch of new sprite accessories. 
-Mainly ports from old Citadel assets.
-Markings: Otter face, Otter nose, Deer face, Cloven hooves, Shepherd snout, Shepherd back.
-Head accessories: Small bear ears, Deer ears, Small antlers, Deer ears with small antlers, Caprine horns, Drake frills.
-Also fixed a Polaris blooper from our tajaran sprite file. (The legs were facing in different directions in side views.)
 2018-06-29 15:32:30 +03:00
Aronai Sieyes
ed8767ce72 Merge pull request #3925 from Verkister/spicyboye 
Adds "redspace" oties.
 2018-06-28 14:34:49 -04:00
Aronai Sieyes
a082cd2a34 Merge pull request #3935 from VOREStation/upstream-merge-5374 
[MIRROR] Gloves cannot be put over Commwatches.
 2018-06-28 14:33:55 -04:00
Unknown
d57b85c597 Vermicetol is now T2 Brute chem 2018-06-28 14:25:20 -04:00
Repede
b04b91a4e3 Merge pull request #154 from Repede/master 
Updates self
 2018-06-28 00:37:55 -04:00
Repede
9155e62b5c Blueshield tweaks and map_template.dm typo fix 2018-06-28 00:23:41 -04:00
Michael Gosselin
a4fa22f06c Merge remote-tracking branch 'refs/remotes/Repede/master' 2018-06-27 22:53:56 -04:00
Michael Gosselin
d8cfad6d94 Fixing R-UST Consoles 
Consoles will now update state depending on whether they're broken or
unpowered.
Adds checks to make sure you can open unpowered or broken consoles.
 2018-06-27 22:53:40 -04:00
Unknown
1af6dbf376 Bicard Nerf 2018-06-27 22:49:41 -04:00
Michael Gosselin
56800356a0 Fixes R-UST Consoles being deconstructable 
Undoes the previous commit, Console will hae to be deconstructed and
repaired to return functionality.
 2018-06-27 21:01:17 -04:00
Hawk_v3
452b5324c5 Merge remote-tracking branch 'upstream/master' into CICleanup 2018-06-28 01:23:48 +01:00
Michael Gosselin
a858517c14 Fixes R-UT EMP breaking consoles 2018-06-27 19:19:21 -04:00
Unknown
b46a15da4e Further Dex Tweaks 2018-06-27 15:36:09 -04:00
Unknown
528f231f41 Medical Tweaks 
- Ointment now treats 3 burn damage per application
- Advanced Trauma Kits treat 6 damage per application, and have 20 uses
- Advanced Burn Kits treat 12 damage per application
- Medical Rescue Suit injector now has 20 units per chem, and uses Inaprovaline, Dylovene, Paracematol, and Dexalin
- Kelotane effectiveness reduced from 6 damage per tick to 4 damage per tick
- Dermaline effectiveness reduced from 12 damage per tick, to 8 damage per tick
- Dexalin metabolizes at 20% of the rate of Dexalin Plus, stats adjusted accordingly (Natje's suggestion)
- Dexalin is now twice as effective (still pales in comparison to Dex Plus)
- Reduced brain healing of Alkysine from 30 to 8
- Vermicetol now works like super tricordazine, healing all damage types at a moderate rate, while metabolizing slowly. Overdose threshold increased from 10u to 15u.
- All pre-filled syringes start capped.
- There is now a 20-second grace period for infection to start ticking up (Note: Using syringes on multiple people renders grace period null and void)
 2018-06-27 15:19:52 -04:00
Repede
5ca23215f0 Merge pull request #147 from Repede/self 
Fixed indent error
 2018-06-26 23:49:36 -04:00
Repede
0da03945ec Fixed indent error 2018-06-26 22:26:31 -04:00
Hawk_v3
969332d859 Span corrections 
Only found one. Hopefully this will sate Travis?
 2018-06-26 22:39:19 +01:00