cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,888 Commits 5 Branches 0 Tags
95ff8c2080a3b5f08d62df0f25fc91c50c193fbc
Commit Graph

11083 Commits

Author SHA1 Message Date
Atermonera
93e0f90479 Merge pull request #7401 from Verkister/patch-44 
Fixes null grab runtime breaking mob movement
 2020-08-02 00:21:35 -04:00
Atermonera
c889e5ebe2 Adds Area-Based Meson Obfuscation 2020-08-02 00:05:29 -04:00
Atermonera
3f3bf073e0 Merge pull request #7366 from Rykka-Stormheart/shep-dev-soundstuff 
Ambiance and Sound Updates
 2020-08-01 23:47:22 -04:00
Mechoid
78b51c58b4 Fish tank 2020-08-01 23:46:08 -04:00
Kates
6437f7aee4 Attempt to fix mech and fighter movement issues within space. (#7376) 
* Attempt to fix mech and fighter movement issues within space.

Here is the issue in question: https://github.com/VOREStation/VOREStation/issues/8438

* Update Mecha.dm to fix #7376 request
 2020-08-01 01:15:51 -04:00
Novacat
c3e3da72f5 Merge pull request #8550 from VOREStation/upstream-merge-7377 
[MIRROR] Species Vars Extension Pt3: Blood!
 2020-07-31 17:19:01 -04:00
Rykka
ae37c4e003 Update Trait Description 2020-07-31 08:07:25 -04:00
Rykka
befcc8c9ea Fixes Cold/Heat-adapted Traits, Prevents heat death in RIGsuit 
Lowers body_temperature to 290k (16.85C) for Cold-Adapted, and raises it to 330k (56.85C) for Hot-Adapted
 2020-07-31 07:49:36 -04:00
Killian
84128e72ff blood mechanics tweaks (#7377) 2020-07-31 04:54:11 -04:00
Novacat
adad5eeacb Merge pull request #8538 from VOREStation/upstream-merge-7354 
[MIRROR] Implements Status Indicators
 2020-07-30 16:53:34 -04:00
Novacat
74875b3d23 Update emote.dm 2020-07-30 16:07:01 -04:00
Novacat
63f5404b7b Merge pull request #8539 from VOREStation/upstream-merge-7358 
[MIRROR] Makes using BYOND Filters easier.
 2020-07-30 16:06:26 -04:00
Novacat
957a0e8058 Update living.dm 2020-07-30 15:45:13 -04:00
Novacat
27eb1e2283 Update modifiers.dm 2020-07-30 15:41:01 -04:00
Unknown
a52fd76249 Fixfix 2020-07-30 15:35:54 -04:00
Atermonera
0f20fbd268 Makes using BYOND Filters easier. 2020-07-30 15:34:07 -04:00
Novacat
2e3dbdfa9a Update life.dm 2020-07-30 15:33:47 -04:00
Novacat
057b9fba16 Update life.dm 2020-07-30 15:32:15 -04:00
Atermonera
65cfe5f6e3 Implements Status Indicators 2020-07-30 15:30:44 -04:00
Unknown
a5121d9ff0 Fixes missing Vox Pidgin, hopefully 2020-07-30 15:28:41 -04:00
Novacat
9578296ca5 Merge pull request #8535 from VOREStation/upstream-merge-7352 
[MIRROR] Increase mob default reload time from 1 second to 4 seconds.
 2020-07-30 15:03:12 -04:00
Novacat
216a8d8c12 Merge pull request #8533 from VOREStation/upstream-merge-7345 
[MIRROR] custom_sprites.dm small improvement and better commenting.
 2020-07-30 14:53:48 -04:00
Novacat
38e4cbd3e9 Merge pull request #8532 from Cyantime/patch-2 
Allows some protean ventcrawl accessories
 2020-07-30 14:53:25 -04:00
Atermonera
f63d2c4506 Merge pull request #7352 from lbnesquik/Kot-Mob-Tweak 
Increase mob default reload time from 1 second to 4 seconds.
 2020-07-30 14:46:19 -04:00
Atermonera
cb31910225 Merge pull request #7345 from LunarFleet/Lun-Sprite 
custom_sprites.dm small improvement and better commenting.
 2020-07-30 14:41:39 -04:00
Novacat
c81eae8191 Merge pull request #8531 from lbnesquik/Kot-Stuff-Cyborg 
Add a little message for once you are done refilling some water as a dogborg.
 2020-07-30 14:33:17 -04:00
Cyantime
120483c41c Allows some protean ventcrawl accessories 2020-07-30 14:30:58 -04:00
lbnesquik
e962474fc5 Add a little message for once you are done refilling some water as a dogborg. 2020-07-30 19:41:18 +02:00
Verkister
744fb20b4a Fixes some trait stats requiring set_species 
Moves a couple trait stats applied via set_species proc to somewhere custom species can actually access them.
Mostly just affects motion based hunger factor, and would also affect health traits but those already have their own bandaid application.
 2020-07-30 11:28:02 +03:00
ShadowLarkens
7f2952bd90 Fix medhuds/sechuds and stuff showing on the camera monitor improperly 2020-07-29 19:03:33 -07:00
Rykka
a34bb589d1 Massive Map/Bugfix 2020-07-28 10:33:56 -04:00
Novacat
c4f7aed7f4 Merge pull request #8215 from dwinters99/spellcheck 
Minor typo fixes
 2020-07-27 01:55:24 -04:00
Novacat
5701af8b95 Update medbot.dm 2020-07-26 01:58:53 -04:00
Atermonera
c1638aa7b8 Fix scrubbers 2020-07-26 01:57:38 -04:00
Rykka
84d9798802 Medibot Interaction Hotfix 
Always check that you're passing the arguments a proc needs.

In this case, I was calling interact(), but not giving it a mob to interact with. Whoops.
 2020-07-25 23:09:09 -04:00
ShadowLarkens
2579579fd1 TGUI'ified Medical Everything 
This converts basically every UI used in the Medical department to use
TGUI instead. Fancy!

ParadiseSS13/Paradise#13738
 2020-07-25 00:44:51 -07:00
ShadowLarkens
c2618c0e66 Merge remote-tracking branch 'upstream/master' into tgui_wires 
# Conflicts:
#	code/__defines/misc.dm
 2020-07-24 17:06:18 -07:00
Cerebulon
8b031dd8ad Persistent Trash/Dirt/Graffiti/Notices 2020-07-24 05:24:56 -04:00
Novacat
47b31301e8 Merge pull request #8413 from Rykka-Stormheart/shep-dev-aurora-cooking 
Aurora Cooking Port
 2020-07-23 02:53:46 -04:00
Shadow-Quill
29173ed58a Pressing Q now properly updates borg modules (#7357) 
* Press Q to refresh borg modules

* No usr for you
 2020-07-23 01:40:41 -04:00
Rykka
21f64e40fd Merge branch 'master' into shep-dev-aurora-cooking 2020-07-22 23:25:41 -04:00
Rykka
886ab72289 Huge Bundle of Fixes, Update Cooking to current Aurora 
Cooking times are now no longer 10-15 minutes per item, the LARGEST items will take around ~4-5 minutes, 6 at the maximum in the case of the superbigbite (one of the most filling food items in the game).
Cooking oil tanks added
Appliances are now constructible instead of being eldritch black magic
Recipes are now reorganized to either fryer/oven/grill based on where they're made (Although recipes_microwave still needs a LOT more sorting)
Critical time bug with cooking fixed, AND you can now upgrade your appliances for even higher efficiencies!
 2020-07-22 21:34:13 -04:00
Verkister
4430c4eed4 Fixes panther rest icon not being used 2020-07-22 17:01:07 +03:00
cadyn
dc5ddb7d01 Added options to shapeshifter verbs for gradients (#7348) 2020-07-22 06:01:47 -04:00
ShadowLarkens
3ea0e50432 Port TGUI Wire datums (ParadiseSS13/Paradise#13769) 2020-07-22 00:23:58 -07:00
Novacat
8b7d087259 Merge pull request #8437 from Tenryumi/dragon-stuff 
Adds dragon-y language and "*gao" emote
 2020-07-21 18:12:43 -04:00
Novacat
453fb2c708 Merge pull request #8432 from cadyn/custom-temp-resistance 
Added more custom species traits for temperature resistance
 2020-07-21 18:11:58 -04:00
Novacat
709d926e33 Merge pull request #8422 from ShadowLarkens/tgui 
TGUI-V4 w/ Camera Console
 2020-07-21 18:09:40 -04:00
Cadyn
ca7092c80c Minor grammar changes 2020-07-21 14:48:50 -07:00
Cadyn
fac86ebbd5 Combined opposite resistance and prone traits into nuetral adaptation traits and removed blooded traits. 2020-07-20 15:45:09 -07:00