cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,104 Commits 5 Branches 0 Tags
8596e303e368f5602cfe7262eb5d75bf8166b8e8
Commit Graph

22472 Commits

Author SHA1 Message Date
EmperorJon
8596e303e3 Merge pull request #1430 from mwerezak/living-life-fix-polaris 
Human Life Fixes
 2016-04-20 13:22:18 +01:00
EmperorJon
89d5175e12 Merge pull request #1438 from Datraen/GameModes2 
Adds three new mixed modes.
 2016-04-20 13:21:31 +01:00
Datraen
c6f2b0f76d Merge pull request #1447 from Yoshax/safetyfiring 
Fixes a typo on the new preference
 2016-04-19 21:12:35 -04:00
Yoshax
4e8ac2515d Further fixes typos 2016-04-19 23:49:57 +01:00
Yoshax
7ae719aea7 Fixes a typo on the new prefence 2016-04-19 23:09:54 +01:00
Datraen
c24ba09834 Bumps up MercenaryRenegade gamemode requirement. 2016-04-19 13:05:05 -04:00
EmperorJon
28ab131610 Merge pull request #1441 from Yoshax/clickcooldownfix 
Adds click cooldowns for attacking non-mob atoms for various mob types +other
 2016-04-19 17:58:03 +01:00
Datraen
a3df9e6eba Merge pull request #1429 from Yoshax/safetyfiring 
Adds a new verb/preference to toggle requirting help intent to fire weapons
 2016-04-19 11:44:53 -04:00
Datraen
c3af56e9f3 Merge pull request #1443 from Yoshax/tablecliming 
Reduces table climbing time by one third
 2016-04-18 16:10:17 -04:00
Yoshax
a77d9269b0 Reduces table climbing time by one third 2016-04-18 18:29:03 +01:00
EmperorJon
47f715805e Merge pull request #1442 from Yoshax/drinksloadout 
Loadout (vacuum-)flask contents now configurable.
 2016-04-18 16:33:42 +01:00
Yoshax
f0c69e663d Fixes error 2016-04-18 15:53:09 +01:00
PsiOmegaDelta
2e6f2c53a6 Loadout (vacuum-)flask contents now configurable. 
Can now prefill the loadout flask and vacuum-flask with a relevant liquid of your choice.
 2016-04-18 15:30:26 +01:00
HarpyEagle
5faf635fae Adds click cooldown for certain cleanables 2016-04-18 15:27:12 +01:00
HarpyEagle
38ffd7306b Adds click cooldowns for attacking non-mob atoms for various mob types 2016-04-18 15:23:22 +01:00
HarpyEagle
03c2ace543 Fixes #11520 
Makes overdosing check volume instead of amount metabolised as its criteria
 2016-04-18 15:16:31 +01:00
Datraen
a681213a02 Adds three new mixed modes! 2016-04-17 22:53:24 -04:00
Neerti
a1ae964c16 Merge pull request #1436 from Datraen/GuestPassOnTopic 
Adds an access check to Guest Pass Terminals
 2016-04-17 20:41:17 -04:00
Neerti
170fafcec7 Merge pull request #1432 from ParadoxSpace/FixesCult 
Fixes Astral Journey Completely Destroying You
 2016-04-17 20:41:05 -04:00
Datraen
bdcc36d8f0 Adds a check to the guest pass terminals to help prevent topic manipulation. 2016-04-17 18:00:04 -04:00
Datraen
12c9156098 Fixes Teshari smocks, updates changelog. 2016-04-17 17:07:53 -04:00
ParadoxSpace
5704a44bf8 saves us all 
blessed be
 2016-04-17 13:52:41 -06:00
HarpyEagle
6ff230c3cc Fixes paralysis not causing stat = UNCONSCIOUS 2016-04-17 01:22:15 -04:00
mwerezak
e3e67fd48a Fixes #12634 2016-04-16 17:30:28 -04:00
HarpyEagle
adf56aad82 And some more excessive processing 2016-04-16 17:30:24 -04:00
HarpyEagle
0488a54297 Removes another excessive AdjustParalysis(-1) 2016-04-16 17:30:23 -04:00
HarpyEagle
abd5b98343 Fixes #12613 
handle_statuses() is now called from living/Life() instead of from handle_regular_status_updates(), replacing the call from handle_status_effects()
 2016-04-16 17:30:23 -04:00
Yoshax
ff96d27a85 Adds a new verb that allows users to toggle the requiring help intent to fire weapons on or off 2016-04-16 18:30:35 +01:00
EmperorJon
ff6526d5a3 Merge pull request #1424 from Neerti/4/16/2016_aim_intent_changes 
Aim Intent Changes
 2016-04-16 17:13:16 +01:00
EmperorJon
61684db81d Merge pull request #1425 from Neerti/4/16/2016_eye_color_verb 
Adds verb to change eye color at will (if mechanical)
 2016-04-16 17:12:36 +01:00
Neerti
69a4242b17 Inventory Tweaks 1 
Evidence bags should no longer start empty.
Reduces maximum width for the inventory background slightly.
Makes a new, slimmer to close the inventory.  This and the maximum width reduction mean the inventory should never overlap with other UI buttons.
 2016-04-16 10:28:14 -04:00
Neerti
3667780871 Adds verb to change eye color at will (if mechanical) 
Adds a verb used by humanoid mobs that have mechanical eyes, which allows them to pick a new color, and have it applied instantly.
Adds some helper functions, specifically hex2rgb(), to convert hexadecimal colors to a list of numbers for r, g, and b.
 2016-04-16 06:14:09 -04:00
Neerti
da53a9ea60 Aim Intent Changes 
Manually ports https://github.com/Baystation12/Baystation12/pull/12614 's fix to not make examining trigger the autofire.
The toggle to shoot if the target talks on the radio defaults to off.
The aim intent icon now updates when clicked.
 2016-04-16 02:30:47 -04:00
EmperorJon
482316ed55 Merge pull request #1368 from Neerti/4/6/2016_new_inventory_port 
Ports Bay's new inventory system.
 2016-04-16 02:58:07 +01:00
Neerti
e4006bb9da Merge pull request #1417 from Mark9013100/4/15/2016sec_loadout 
Adds the Warden & HoS navy blue and corp jumpsuits to loadout
 2016-04-15 20:37:16 -04:00
Mark9013100
54955c4ea0 Adds the Warden & HoS navy blue and corp jumpsuits to loadout 2016-04-15 13:44:04 -04:00
Mark9013100
2accd60a5b Moves detective clothing from the cabinet to wardrobe 2016-04-15 13:27:28 -04:00
redstryker
cc1d3e5c6d Adds Departmental Ponchos V2 (#1365) 
* Adds Departmental Ponchos

* Adds /roles to path in loadout

* Adds /roles to path for ponchos

* Added typesof(.../roles)

* Removes unneeded paranthesis

* Removes Armor Values

Removes armor values because fuck this shit, I just want this to get merged.
 2016-04-15 11:20:12 -04:00
Datraen
a287d8b657 Merge pull request #1390 from Anewbe/Cryosleep 
Shortens cryosleep timer
 2016-04-15 11:16:20 -04:00
Neerti
bcfa4aab79 Merge pull request #1403 from EmperorJon/11_Apr._Lockdown_fix 
Lockdown fix
 2016-04-13 12:38:06 -04:00
EmperorJon
a3652eacc6 Merge pull request #1398 from Neerti/4/11/2016_slowdown_fixes_and_stealth_nerfs 
Slowdown Fix
 2016-04-13 17:31:07 +01:00
Jon
931719b336 Removes traitor check 2016-04-12 02:20:28 +01:00
PsiOmegaDelta
4286cd959e Resist tweaks. 
Can now resist out of handcuffs and buckle restraints. Fixes #12359.
No longer resist out of every possible type of restraint at the same time.

# Conflicts:
#	code/modules/mob/living/carbon/resist.dm
 2016-04-12 02:01:50 +01:00
Jon
327d4ba11b Fixes lockdown for Autotraitor synths. 2016-04-12 00:29:13 +01:00
Jon
2389b1d997 Part 1 of a lockdown fix. 
Borgs now show the correct operational status/lock-unlock button in the UI.
Autotraitor borgs can still be locked down. This doesn't fix that.
 2016-04-11 23:22:38 +01:00
Datraen
a88dd1f961 Merge pull request #1397 from Yoshax/nogrief 
Adds full atmospherics reset admin verb
 2016-04-11 17:17:35 -04:00
Datraen
3a363173f9 Merge pull request #1400 from Mark9013100/4/11/2016cyro_dump_fix 
Fixes cryocells dumping patients out without being asked to
 2016-04-11 15:38:53 -04:00
Mark9013100
4be2c28edb Fixes cryocells dumping patients out without being asked to 2016-04-11 12:48:26 -04:00
Carl Ivanov
06813f01df Fixes Give Random (Head) Job 2016-04-11 16:44:34 +01:00
Neerti
10e2683955 Slowdown Fix 
Slowdown is now correctly applied for objects intended to have slowdown, for example Dufflebags and Arm Guards, as many more slots are checked for slowdown instead of just the suit and shoe slots.  Slots checked are now suit, uniform, back, gloves, head, suit storage, and the left and right hands.
 2016-04-11 05:02:47 -04:00