cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,999 Commits 6 Branches 0 Tags
c1fe64ba6aecd357ee89dac425426fe2d41416ab
Commit Graph

23811 Commits

Author SHA1 Message Date
Atermonera
c1fe64ba6a Merge pull request #6717 from LeighKnapenberger/master 
Fixes Mint Apple Sparkle having a recipe, but no drink
 2020-02-24 16:00:57 -05:00
Novacat
bfa123c1f0 Merge pull request #6661 from Heroman3003/sofafix 
Makes all sofa colors/subtypes makeable
 2020-02-24 03:35:07 -05:00
Heroman
726664f6f0 Makes all sofa colors/subtypes makeable 2020-02-24 18:19:56 +10:00
Heroman
a5653c6eb2 Better fix for the missing accessories on taurs 2020-02-24 17:39:21 +10:00
Heroman3003
b12348f909 Merge branch 'master' into maint_pred 2020-02-24 11:00:59 +10:00
Heroman
518ccfab5b Fixes cloaks being broken on taurs. 2020-02-24 08:47:31 +10:00
Novacat
d247f88329 Merge pull request #6651 from VOREStation/upstream-merge-6710 
[MIRROR] Ports precision placement of items
 2020-02-22 10:33:58 -05:00
Novacat
6385766328 Update living.dm 2020-02-22 09:50:36 -05:00
Atermonera
11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -05:00
Atermonera
41f111ea54 Merge pull request #6697 from Heroman3003/scannerfix1 
Fixes missing sprites on forensic scanner
 2020-02-22 02:17:23 -05:00
Novacat
b0c6118a52 Merge pull request #6638 from VOREStation/upstream-merge-6714 
[MIRROR] Renames Make All Areas (Un)Powered secret
 2020-02-21 10:37:48 -05:00
Novacat
aea99134e6 Merge pull request #6636 from VOREStation/upstream-merge-6709 
[MIRROR] [Bugfix?] Bat Attack Spelling Fixy
 2020-02-21 10:37:31 -05:00
Atermonera
a54a7912cb Merge pull request #6714 from Heroman3003/verbrename 
Renames Make All Areas (Un)Powered secret
 2020-02-21 02:27:08 -05:00
Atermonera
9029bcc85e Merge pull request #6709 from TheFurryFeline/patch-6 
[Bugfix?] Bat Attack Spelling Fixy
 2020-02-21 02:14:18 -05:00
Atermonera
1010fd283b Merge pull request #6690 from VOREStation/vplk-ntnet-fixer 
Fixes to Modular Computers and NTNet Relays
 2020-02-21 01:58:20 -05:00
Unknown
146d7ec7e1 Minor Protean Balans Tweaks 
- Boosts limb health to be roughly the same as Prometheans
- Gives slight brute resist
- Slightly reduces burn weakness
 2020-02-19 20:22:28 -05:00
Arokha Sieyes
9fadae4392 Fix to_chat typo 
This file is unchecked so it's not being used, but I'd still rather not leave this.

(cherry picked from commit 00b61d9bcb36e08aca10d72dcf0e2d00655a9527)
 2020-02-19 19:36:14 -05:00
Greenjoe12345
3391de2f42 canes and crutches (#6694) 
* Edited white cane inventory/ground sprite, and changed in-hand sprites to ones from Yawn Wider
added a telescopic cane, ported from Yawn Wider (credit to gozulio)
ported the crutch item from world server
both new items were added to loadout

* Edited white cane inventory/ground sprite, and changed in-hand sprites to ones from Yawn Wider

added a telescopic cane, ported from Yawn Wider (credit to gozulio)
ported the crutch item from world server
both new items were added to loadout
also fixed config.txt fuckup

* fixed a spelling error
 2020-02-19 14:34:41 -05:00
Heroman3003
07a73c7f23 Lowers cost of ponchos and cloaks in loadout (#6705) 2020-02-19 01:24:51 -05:00
Heroman
a6d6cf7825 More fixes for broken medical 2020-02-19 08:35:37 +10:00
Heroman
cdd0885c93 Fixes broken tool usability logic for surgery 2020-02-18 18:11:35 +10:00
Meghan-Rossi
dfc42293c7 Fluff items and species whitelisting 
*Adds AmareWolf to Xenochimera whitelist - approved in https://forum.vore-station.net/viewtopic.php?f=46&t=1655
*Adds medal of unity for Roy Tilton - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1629
*Adds balaclava for Monty Kopic - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1628
*Adds warning collar for Excess - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1593
*Deletes obsolete/unused file "custom_items.txt"
 2020-02-18 00:27:36 +00:00
Arokha Sieyes
14942ee6c7 VS: Don't talk to strangers 2020-02-17 12:44:17 -05:00
Arokha Sieyes
3cbd51c6d1 Don't talk to strangers 2020-02-17 12:44:10 -05:00
Novacat
33570d10e6 Update ore_box.dm 2020-02-17 01:33:15 -05:00
Novacat
332e3271d9 Update ore_box.dm 2020-02-17 01:31:48 -05:00
Novacat
e8526a420c Update robot.dm 2020-02-17 01:30:10 -05:00
Novacat
5ea36b7a60 Update robot_movement.dm 2020-02-17 01:29:20 -05:00
Atermonera
c5b6dfa259 Fixes mining borg ore box movement astral sorcery 2020-02-17 01:18:31 -05:00
Novacat
106711b0f3 Merge pull request #6508 from VOREStation/Verkister-patch-7 
A ban-flinging QoL update
 2020-02-14 20:53:25 -05:00
Arokha Sieyes
74c6f7c1e7 Rename "Aronai Kadigan" -> "Aronai Sieyes" 2020-02-14 11:06:04 -05:00
Novacat
db2e0bf71c Merge pull request #6573 from Heroman3003/hard-safety 
Prevents resleeving sickness from affecting hardvore victims
 2020-02-14 09:35:58 -05:00
Novacat
4f4a29b5fc Merge pull request #6568 from VOREStation/stream 
Remove use of <<
 2020-02-14 09:34:12 -05:00
Novacat
1c459d7416 Merge pull request #6572 from VOREStation/upstream-merge-6689 
[MIRROR] cash registers and retail scanners show transaction totals on examine
 2020-02-14 09:33:01 -05:00
Heroman
b09c8c5a38 Prevents resleeving sickness from affecting hardvore victims 2020-02-14 10:07:02 +10:00
Atermonera
20f60c4a8b cash registers and retail scanners show transaction totals on examine (#6689) 2020-02-13 17:11:53 -05:00
Heroman3003
718feb1ebe Adds pineapple pizzabox (#6682) 2020-02-13 17:11:43 -05:00
Aronai Sieyes
641ed43b23 This one should be WRITE_LOG 2020-02-13 12:21:03 -05:00
Atermonera
cae97cf4c0 Merge pull request #6659 from Darlantanis/MetamorphicPintGlas 
Metamorphic Pint Glass
 2020-02-13 00:31:59 -05:00
Arokha Sieyes
7f1aabbf25 Weird cases where to_chat freaks out 2020-02-12 19:38:45 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Heroman
0ebf8b163a Removes Crate Mimic from list of available maintenance preds 2020-02-13 09:40:29 +10:00
Heroman
5ba0e0805c Prevents the pred going buck wild if player leaves 2020-02-13 09:39:32 +10:00
Heroman
94b8236398 Fixes new tools on pupdozer being duplicated 2020-02-13 07:08:43 +10:00
Novacat
c8a8987610 Merge pull request #6524 from Heroman3003/beaconchange 
Makes syndie beacon found in xenoarch use virgo-specific subtype
 2020-02-12 10:43:24 -05:00
Novacat
448526bfdc Merge pull request #6553 from Heroman3003/log-the-prefs 
Adds logging to the breaking of devourable/feeding prefs
 2020-02-12 10:42:28 -05:00
Verkister
0afc30e8ac Update functions.dm 2020-02-12 15:19:53 +02:00
Atermonera
cb75ffdc72 Very low levels of radiation are no longer harmful (#6684) 2020-02-12 00:15:55 -05:00
Heroman
3f75b09ea2 Fixes morph spawn event bugs 2020-02-12 12:36:22 +10:00
Heroman
8ac52fef61 Adds Maintenance Predator random event 2020-02-12 12:33:46 +10:00