cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,984 Commits 8 Branches 0 Tags
6393cb15d8f10833e899bad30812180424931b3d
Commit Graph

7776 Commits

Author SHA1 Message Date
mwerezak
c55747272a Makes it harder to accidentally undress yourself 2014-05-30 20:01:16 -04:00
mwerezak
d5217fef9d Custom item for YankeeSamurai: Hal Ishimaru 2014-05-30 19:52:54 -04:00
Mloc-Argent
3d2cc3cd82 Revert "Merge pull request #4985 from jack-fractal/dev" 
This reverts commit 1679b4062f, reversing
changes made to b149b273d9.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/datums/visibility_networks/update_triggers.dm
 2014-05-31 00:25:56 +01:00
Mloc-Argent
ee2e68960a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/admin/admin_verbs.dm
 2014-05-31 00:17:56 +01:00
RavingManiac
ad810f0a4a Supermatter shards have a smaller pull-radius. 
Leftover variable removed.
 2014-05-31 00:28:38 +08:00
RavingManiac
bf0c972677 Unanchored objects and players without magboots are pulled twice as fast towards the supermatter. 2014-05-30 21:17:40 +08:00
RavingManiac
12aa2ebe6c Before detonation, supermatter pulls all objects, including anchored objects in a 13-tile radius (just enough to cover the control room) towards it for 10 seconds. Windows within this radius are immediately shattered. 
Supermatter no longer pushed around by airflow.
 2014-05-30 20:47:40 +08:00
UristMcKerman
3f80a82c7e Fix 
No everlasting events.
 2014-05-30 14:47:13 +04:00
Ravensdale
aa5cd46bf3 Fix to breathing in bad air. 2014-05-30 03:46:59 -07:00
Ravensdale
167fae9cf4 Fixed accidental rename during Phoron project 2014-05-30 03:05:50 -07:00
Chinsky
3ea17cefaf Merge pull request #5083 from mwerezak/co2 
New System for CO2 Asphixyation
 2014-05-30 12:44:26 +04:00
Ccomp5950
fd78c58f46 Bot down? Let's not lock up the entire server. 
Instead we'll spawn a thread to handle it, not like we care what is returned either way.
 2014-05-29 21:36:34 -05:00
Mike
06eb4c6edf C02 -> carbon_dioxide 
Renamed carbon dioxide breathing type string to hopefully prevent
confusion in the future.
 2014-05-29 20:17:51 -04:00
UristMcKerman
e37a70089b Tweaks for spam #2 
Added brackets surrounding tokens to make whitespace and empty tokens
removable.
Slightly modified ion storm behavior.
Increased duration required to stop spam to 5 minutes.
Added ability to expand spam filter limit with installation of message
monitor circuits.
People will see why their message been discarded.
Discarded messages will be highlighted with red color in message log.
 2014-05-29 16:05:00 +04:00
Zuhayr
045168ba17 Merge pull request #5082 from mwerezak/inaprovaline 
Inaprovaline no longer a substitute for breathing
 2014-05-29 11:19:18 +09:30
UristMcKerman
c78605b1a4 Tweaks for spam 
Added non-randomized example tokens at start. Added filter limitation.
Ion storm will replace tokens with garbage. Spam disaster lasts longer
and is more severe.
 2014-05-29 00:31:02 +04:00
mwerezak
9747276eb1 Fixes missing 'else' 2014-05-28 11:47:20 -04:00
mwerezak
47a7617edd Inaprovaline no longer a substitute for breathing 2014-05-28 11:27:21 -04:00
mwerezak
d677a91c3c Adjusts co2 warning frequencies 2014-05-28 10:59:02 -04:00
UristMcKerman
0a0ce28f68 Added spam filter 
Added spam filter functionality to message server and message server
monitor.
 2014-05-28 17:12:18 +04:00
Ccomp5950
e4f561ce4d Merge pull request #5080 from comma/dev 
Added new BBCode tags, for tables and NT logo.
 2014-05-28 03:22:30 -05:00
Zuhayr
8f50fbcd3b Fixes #4940 2014-05-28 17:00:31 +09:30
Zuhayr
c2b97b7fcb Fixes #4643 2014-05-28 16:41:54 +09:30
Chinsky
61f00628f1 Added new BBCode tags, for tables and NT logo. Removes html support from paper. 2014-05-28 10:49:24 +04:00
Chinsky
ec37f1f5d2 Merge pull request #5079 from Jarcolr/custom_items 
Adds *2* custom items and updates a sprite
 2014-05-28 09:17:00 +04:00
Ccomp5950
4bb59352f5 Merge pull request #4968 from MrLeebo/mutiny 
Mutiny Mode
 2014-05-28 00:13:42 -05:00
Jarcolr
f318e24827 Adds 2 custom items and updates a sprite 
Paths are:
/obj/item/clothing/glasses/eyepatch/fluff/edmund
/obj/item/clothing/suit/storage/fluff/lombardi
 2014-05-27 20:47:01 +03:00
Chinsky
4594e2bf1b Merge pull request #5071 from Ravensdale/dev 
Updates most used viable entries of Tau Ceti to Nyx
 2014-05-27 21:46:43 +04:00
mwerezak
32f6d89bea Completed unfinished species.breath_type switch 2014-05-27 03:00:31 -04:00
mwerezak
fbaa84c509 More sensible oxyloss scaling 2014-05-27 02:41:12 -04:00
mwerezak
694f0706bb Fixes inhale_pp ratio 
The amount of inhaled gas used shouldn't approach infinity as inhale_pp
goes to zero, should it?

Also the amount of gas used should decrease with inhale_pp as the
oxyloss is being caused by the fact that fewer moles are entering the
bloodstream.
 2014-05-27 02:39:32 -04:00
mwerezak
2160aae1ab New system for CO2 asphixyation 
Too much CO2 now makes you slowly gain oxyloss instead of making you
fall unconscious immediately and quickly killing you after 30 seconds.
 2014-05-27 02:20:15 -04:00
Ravensdale
84fd33ad08 Fix oversight of TC daily 
Good eye Zuh
 2014-05-26 20:07:03 -07:00
Ravensdale
abdadd35b4 Updates most used viable entries of t cet to Nyx 2014-05-26 15:58:16 -07:00
mwerezak
7c7df8b4e2 Fixes #5018 2014-05-26 17:16:58 -04:00
Zuhayr
4538fbabca Lots of work on hardsuits, commented out some broken WIP code, did some renaming, deleted now-redundant species-specific hardsuits. 2014-05-27 01:18:07 +09:30
Zuhayr
13046655e8 Changed by-species icon sheets to by-clothing species-specific icon sheets. 2014-05-27 01:17:26 +09:30
Zuhayr
2c9d81c831 Merge branch 'suitcycler' of https://github.com/Zuhayr/Baystation12 into dev 2014-05-26 23:24:47 +09:30
Zuhayr
dcbe9ce061 Merge pull request #5048 from Hubblenaut/dev-freeze 
Paper bundle fixes and other general game improvements
 2014-05-26 23:18:27 +09:30
Zuhayr
32935b4db9 Merge pull request #5055 from mwerezak/disease2-verb 
Fixes #4889
 2014-05-26 16:53:00 +09:30
Jeremy Liberman
d3541d1e08 Merge branch 'dev' into mutiny 2014-05-25 14:22:16 -05:00
Jeremy Liberman
c607872b80 Mutiny fix prereqs for directives 2014-05-25 14:20:37 -05:00
Zuhayr
1313034133 Merge pull request #5044 from mwerezak/consoles 
Console fixes
 2014-05-25 22:09:47 +09:30
Zuhayr
9b93600d6e Prevented toggling a suit helmet while holding the suit. 2014-05-25 21:57:39 +09:30
Zuhayr
78db44e96f Squashed hardsuit and suit cycler commits: 
Basic preliminary breach handling.
Breached spacesuits act more sanely and now result in pressure loss.
Preliminary work for upgrading hardsuits.
Adds suit cycler.
Working on breach data for hardsuits.
More tweaks to the suit cycler.
More rig changes/tweaks.
 2014-05-25 21:50:43 +09:30
Mloc
6a87d33f7a Merge pull request #5053 from Loganbacca/orebox 
Ore box verbs
 2014-05-25 10:46:38 +01:00
Mloc
d3c1f371e2 Merge pull request #5052 from mwerezak/supermatter 
Supermatter Tweaks
 2014-05-25 10:45:33 +01:00
Loganbacca
fadf56b5fc Ore box verb tweaks 
- Added more sanity checks
- Added more user feedback
 2014-05-25 12:20:54 +12:00
Ccomp5950
0ca4aaa316 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-05-24 19:03:51 -05:00
Ccomp5950
ff0d667337 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 2014-05-24 19:02:16 -05:00