cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-11 01:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,839 Commits 7 Branches 0 Tags
52b41f00199f4cc52ddb3d9957ce99ca1b7bedee
Commit Graph

24607 Commits

Author SHA1 Message Date
izac112
52b41f0019 Might look better 
Signed-off-by: izac112 <izac10@live.com>
 2020-02-01 01:22:50 +01:00
izac112
684b737dd0 Re-Adds prom water damage 2020-02-01 01:11:13 +01:00
Repede
2be5ceca85 Fixes service borg having plasteel for some reason / compile fix 2020-01-31 17:44:15 -05:00
izac112
933385020f Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update 
# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved
 2020-01-31 18:23:50 +01:00
Atermonera
1bc3ccf858 Merge pull request #6652 from Rykka-Stormheart/shep-dev-missing-no 
Hacky Fix for Athletic Shorts showing Missing Icon
 2020-01-30 19:24:59 -05:00
Novacat
7a9f31a26a Merge pull request #6515 from TheFurryFeline/patch-18 
Redundant Warning Removed
 2020-01-30 02:09:59 -05:00
TheFurryFeline
301cae5994 Redundant Warning Removed 
Changelog Notes: 

- Removes the big, honking red text about archive being slated for removal. We're not removing entries from the database.
 2020-01-29 12:28:28 -05:00
Atermonera
16989eaa84 Merge pull request #6650 from Shadow-Quill/Stacker-Runtime-Fix 
Fixes constant stacking machine runtimes
 2020-01-28 14:14:06 -05:00
Novacat
75b8b621f9 Merge pull request #6490 from Rykka-Stormheart/shep-dev-borghound-buffs 
Add additional tools for Research Hound and Pupdozer - Upstream Port
 2020-01-26 16:38:37 -05:00
Novacat
f522a88378 Merge pull request #6489 from Rykka-Stormheart/shep-dev-pupdozer-model 
Add Citadel RP Alternative Pupdozer + Additional Tools - Upstream Port
 2020-01-26 16:38:25 -05:00
Novacat
4505684fbd Merge pull request #6507 from VOREStation/upstream-merge-6603 
[MIRROR] Add an audible alarm sound to SM Delamination
 2020-01-25 23:04:14 -05:00
Novacat
c44268a96d Merge pull request #6506 from VOREStation/upstream-merge-6649 
[MIRROR] Fixes Bagel Poppy Recipe
 2020-01-25 22:56:34 -05:00
Novacat
2366e865f3 Update supermatter.dm 2020-01-25 22:56:18 -05:00
Atermonera
d5869f2c3f Add an audible alarm sound to SM Delamination 2020-01-25 22:25:49 -05:00
Atermonera
4e523c9b5e Merge pull request #6649 from Trexdude/patch-1 
Fixes Bagel Poppy Recipe
 2020-01-25 22:16:18 -05:00
Atermonera
560a24ee83 Merge pull request #6637 from Mechoid/AugmentsRespectBeds 
Augments Respect Beds, Robotic
 2020-01-25 22:14:02 -05:00
Repede
44819df15f Merge branch 'master' into Bluecoffe-Runtime 2020-01-25 21:40:52 -05:00
Shadow
1c5c211734 Aaaaa 2020-01-25 20:17:32 -06:00
Shadow
7e831fc9f1 Covfefe 2020-01-25 20:09:13 -06:00
RadiantFlash7
e80b079088 Merge branch 'master' of https://github.com/RadiantFlash7/YWPolarisVore 2020-01-25 01:29:25 -05:00
RadiantFlash7
8704ce4f39 Typo fixes 
Typofixes in event anouncements.
 2020-01-25 01:29:13 -05:00
RadiantFlash7
bfef971ffd Merge branch 'master' into master 2020-01-25 01:25:45 -05:00
RadiantFlash7
c2ea5fd750 Merge branch 'master' of https://github.com/RadiantFlash7/YWPolarisVore 2020-01-25 01:23:25 -05:00
RadiantFlash7
2931d08ffe Medbay Re-work, gunless vendors 
Moves Ballestics guns from vendors to equipment area in front of armoury (Still for officer's use.)
Reworks like. Most of medbay. (I pulled my hair out for you hawk. Love me ;-;)
Most important feature: Emotional support Corgi named Mister Wiggles.
 2020-01-25 01:23:16 -05:00
TheFurryFeline
0b10c316cc Aaa 
Typo fix to comment, ree.
 2020-01-24 11:17:30 -05:00
TheFurryFeline
41ce1ae13f No More Vines That Shrink Thee 
Changelog Notes: 

- Blacklist Macro/micro/normal cillins from list of spawnable chems in vines that can get injected into your body. This is purely for pref reasons if you don't actually like having your size changed.
 2020-01-24 10:26:11 -05:00
Novacat
4d2ec30fb9 Merge pull request #6499 from VOREStation/upstream-merge-6645 
[MIRROR] Adds book cart to library
 2020-01-24 00:55:57 -05:00
Novacat
44bad05eed Merge pull request #6501 from VOREStation/upstream-merge-6639 
[MIRROR] Preset (mapped-in) modular computers now have printers by default.
 2020-01-24 00:54:22 -05:00
Atermonera
ac208d171d Preset (mapped-in) modular computers now have printers by default. (#6639) 2020-01-23 23:55:51 -05:00
Schnayy
8ebe8c8772 Adds book cart to library 2020-01-23 23:53:25 -05:00
Schnayy
98d0b5a2bc Adds drink sprites for missing ones. Replaces lemonade to match the other -ade drinks. (#6644) 2020-01-23 23:52:12 -05:00
Repede
6f3ea86aaa Merge branch 'master' into ringtones 2020-01-23 18:48:20 -05:00
Cebutris
9bde77ed63 ringtone >> ttone 2020-01-23 18:44:00 -05:00
Repede
5a9ab0a62a Makes Teshari able to "see" (IC: Hear) people through walls, but as a drawback, are always near-sighted. 
A deaf teshari cannot see mobs through walls, they are still near-sighted though.

Also re-adds ventcrawling for protean blobs.
 2020-01-23 18:17:15 -05:00
Novacat
2914cbf2ce Merge pull request #6497 from VOREStation/upstream-merge-6648 
[MIRROR] Fix Water Resistance.
 2020-01-23 17:40:31 -05:00
Novacat
37f2862660 Update species.dm 2020-01-23 17:14:31 -05:00
Atermonera
b2cafb7e14 Fix Water Resistance. 2020-01-23 17:13:51 -05:00
Heroman
824637d6a4 _vr 2020-01-24 08:13:45 +10:00
Heroman
d8c43701ff Removes prommies weakness to water entirely 2020-01-24 08:11:02 +10:00
Heroman
2ca6c5870a Earlyports fix for water killing everything 2020-01-24 07:59:24 +10:00
Rykka
433ecaf14d Add additional tools for Research Hound and Pupdozer - Upstream Port 
Adding features from the other borg modules over to the dogborg versions.

Pupdozer:

Air Analyzer
Pipe Painter
Floor Painter
Geiger Counter
Plasteel manipulator
Research Hound:

ID card to open other borg interfaces
Organ gripper
Mech part gripper
Robot Analyzer
Welding tool
Wrench
Wirecutters
Multitool
Nanopaste reserves
Wire reserves

Port from YW/Chompstation - https://github.com/Yawn-Wider/YWPolarisVore/pull/390
 2020-01-22 01:52:48 -07:00
Rykka
b43e7f9e71 Add Citadel RP Alternative Pupdozer + Additional Tools - Upstream Port 
Adding "V2 Engidog" to Pupdozer list
Adding four modules to the Pupdozer module: Air Analyzer, Sheet Loader, Magnetic Gripper, Pipe Painter and Floor Painter.

Port from YW/ChompStation
 2020-01-22 01:46:51 -07:00
Cebutris
546de503d0 remove kh 2020-01-22 03:03:34 -05:00
Cebutris
70fa53cb2c beep 2020-01-22 02:59:41 -05:00
Novacat
3d0b07a154 Merge pull request #6485 from VOREStation/upstream-merge-6630 
[MIRROR] IP reputation checking
 2020-01-21 19:13:19 -05:00
Novacat
b0b60d051e Update client procs.dm 2020-01-21 18:56:54 -05:00
Atermonera
c0e64d5126 Merge pull request #6638 from Mechoid/BumpGameMasterTime 
Drops the time between events possible duration.
 2020-01-21 18:12:47 -05:00
Atermonera
44d334a37c IP reputation checking 2020-01-21 18:11:29 -05:00
Izac Joof Forsgren
23c246db84 Revert "Firing Pin Port" 2020-01-21 15:59:23 +01:00
Novacat
9e0e860f4e Merge pull request #6454 from VOREStation/discoban 
Ban/unban, note/unnote, kick to webhook
 2020-01-21 01:46:53 -05:00