cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,216 Commits 5 Branches 0 Tags
a0ab995551a0e8cb15b8ca5f0026aa5f21698cbc
Commit Graph

2946 Commits

Author SHA1 Message Date
Atermonera
6bb587a298 neachgol (#6668) 2020-02-14 03:43:26 -05:00
Novacat
a60e5cae18 Merge pull request #6562 from VOREStation/upstream-merge-6687 
[MIRROR] Shutoff monitoring console remotely controls valves
 2020-02-12 10:41:28 -05:00
Atermonera
3961c4cdbf Shutoff monitoring console remotely controls valves (#6687) 2020-02-12 00:17:09 -05:00
Atermonera
cb75ffdc72 Very low levels of radiation are no longer harmful (#6684) 2020-02-12 00:15:55 -05:00
Atermonera
6374108fa2 Applies same restrictions as first aid to external synth repair 2020-02-10 18:53:31 -05:00
Atermonera
571fe9f734 Merge pull request #6667 from Heroman3003/voidsuti-surgery 
Prevents surgery from being done while wearing a voidsuit
 2020-02-10 16:03:04 -05:00
Atermonera
7b20362aaf Merge pull request #6662 from Shadow-Quill/Baton-Intent-Change 
Stunbatons will now only harmbaton on grab/harm intents
 2020-02-09 14:47:00 -05:00
Atermonera
c9e3257d17 2020 Civilian Wing Overhaul 2020-02-08 13:56:05 -05:00
Atermonera
1f227a9b55 Merge pull request #6664 from PrismaticGynoid/loadouttoys 
Adds some toys to the loadout
 2020-02-03 20:50:45 -05:00
Novacat
1993581cfc Merge pull request #6532 from VOREStation/upstream-merge-6657 
[MIRROR] Unregulated passive regulators don't limit flow
 2020-02-02 22:55:05 -05:00
Atermonera
3e81b3e5a7 Unregulated passive regulators don't limit flow (#6657) 2020-02-02 17:10:18 -05:00
Atermonera
a6e84e4cdf changelog (#6643) 2020-02-02 17:09:05 -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
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
Atermonera
908489b1bd Merge pull request #6640 from TheFurryFeline/patch-5 
Aaaa, typo fixy
 2020-01-21 18:14:22 -05:00
TheFurryFeline
1f99be6906 Light Frame Infinite Steel Fixy (#6633) 
* Light Frame Infinite Steel Fixy

Title.

Changelog Notes: 

- Fixes light frames returning 5 steel per deconstruction when 2 steel is used to create the frame.

* Changelog
 2020-01-19 00:51:24 -05:00
TheFurryFeline
dc0c513086 Changeling Item Name/Desc Fixy (#6624) 
* Changeling Name/Desc Fixy

Minor var fixes for the changeling combat boots variation. Apparently name and desc were flipped around, resulting in abnormal name output when removed from a dead Beta Replicant.

* Changelog
 2020-01-16 02:56:14 -05:00
Atermonera
d5775d03be Merge pull request #6610 from Schnayy/glitterfly_borg 
Adds Pyralis borg sprite
 2020-01-10 01:11:20 -05:00
Atermonera
2a594a23b0 last changelog of the year (#6594) 2020-01-05 18:09:28 -05:00
Atermonera
45b4947d1e Merge pull request #6584 from TheFurryFeline/TFF-Print_Da_Sprayers 
Printable Spray Bottles
 2019-12-25 18:10:16 -05:00
Novacat
01b57eb28f Merge pull request #6344 from VOREStation/upstream-merge-6572 
[MIRROR] Buffs radiation so it isn't defeated by a thin sheet of lead.
 2019-12-24 11:59:27 -05:00
Cerebulon
183b1d99b1 Coffee Shop Revamp 2019-12-22 22:54:01 -05:00
Atermonera
49185470ec changelog! For the first time in weeks because school! (#6573) 2019-12-22 00:06:39 -05:00
Atermonera
6b462af3ee Merge pull request #6569 from TheFurryFeline/TFF-Bulbs_Recycling 
Light Replacer QOL
 2019-12-21 14:31:10 -05:00
Atermonera
0111815165 Buffs radiation so it isn't defeated by a thin sheet of lead. 2019-12-20 00:51:06 -05:00
PrismaticGynoid
b22ec21911 Graffiti selection (#6562) 
* Lets you choose what type of graffiti or rune to draw when vandalizing the floor with crayons or markers. No more drawing and erasing a dozen times to get the exact graffiti you want.

* Puts in Mechoid's suggestion
 2019-12-13 20:37:14 -05:00
Novacat
c8b277096e Merge pull request #6261 from VOREStation/upstream-merge-6547 
[MIRROR] Lamps, Lights, Lackluster!
 2019-11-29 20:27:36 -05:00
Novacat
84f2c214e7 Merge pull request #6258 from VOREStation/upstream-merge-6535 
[MIRROR] Fix Strange Rock Size
 2019-11-29 20:15:22 -05:00
Novacat
d5fa9f6e85 Merge pull request #6257 from VOREStation/upstream-merge-6554 
[MIRROR] Protolathe Power Cells Tweak
 2019-11-29 20:10:13 -05:00
Novacat
dd78e39916 Merge pull request #6256 from VOREStation/upstream-merge-6553 
[MIRROR] Fixes Naming ED-209 and ED-CLN
 2019-11-29 20:09:55 -05:00
Anewbe
068e132603 Merge pull request #6547 from TheFurryFeline/TFF-Lamps_Lights_Lackluster 
Lamps, Lights, Lackluster!
 2019-11-29 19:51:34 -05:00
TheFurryFeline
cc54005602 Fix Strange Rock Size (#6535) 
* Fix Strange Rock Size

Title

* Create TheFurryFeline - Strange Rock Fixy.yml.txt

* Proper Changelog Filetype
 2019-11-29 19:51:02 -05:00
Anewbe
249a05e888 Merge pull request #6554 from Nalarac/Cellicon 
Protolathe Power Cells Tweak
 2019-11-29 19:49:48 -05:00
Anewbe
ced3499065 Merge pull request #6553 from Nalarac/ED209 
Fixes Naming ED-209 and ED-CLN
 2019-11-29 19:49:37 -05:00
Anewbe
cbe8493dbf November Map Tweaks 2019-11-29 19:47:49 -05:00
Anewbe
e7c7da7db1 Merge pull request #6536 from Nalarac/Capset 
Captain and HoP Headsets Fully Enabled by Default
 2019-11-28 14:15:11 -05:00
Anewbe
e1996cbf9f Merge pull request #6481 from Atermonera/maint_drone_spawn 
Reduces maintenance drone spawn time to 5 minutes
 2019-11-24 17:29:12 -05:00
Atermonera
ec3167e4ce Merge pull request #6525 from TheFurryFeline/TFF-Let_The_Plushies_Live! 
Mouse Plushie Sprite Change
 2019-11-19 14:28:32 -05:00
Atermonera
fff8e402c9 Merge pull request #6487 from Novacat/nova-accessory 
Adds Teshari Plush
 2019-10-23 19:20:47 -04:00
Woodratt
a4c2786bcc Oct Map Fixes 2019-10-23 02:00:52 -04:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Poojawa
eb0234b1af Adds 'Devourable" and 'feeding' prefs 2019-10-15 02:01:51 -05:00
Poojawa
f718201974 Adds Sound Code and toggles 2019-10-13 02:05:16 -05:00
Atermonera
5a3398daec Merge pull request #6473 from Woodratt/09272019_weightbodytype 
Port weight/body types to traits
 2019-10-06 03:34:05 -04:00
Atermonera
4eb1e378f6 Merge pull request #6447 from TheFurryFeline/TFF-Orange_Is_The_New_Orange_Part_2 
Orange Is The New Orange Part 2
 2019-09-25 17:09:00 -04:00
Atermonera
e26f16e73b Bar and Kitchen Merge 2019-09-18 16:40:18 -04:00
Unknown
e0e45c13a2 Resets changelog folder to Polaris 2019-09-15 17:46:57 -04:00
Atermonera
0ff8e84fcd changelog (#6448) 2019-09-15 17:10:44 -04:00
Atermonera
cb6427d93f Adding Vendors 2019-09-07 23:17:29 -04:00