mwerezak
a98d9eef3d
Vending machines can now be unanchored
2014-05-30 18:35:20 -04:00
Chinsky
3ea17cefaf
Merge pull request #5083 from mwerezak/co2
...
New System for CO2 Asphixyation
2014-05-30 12:44:26 +04: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
mwerezak
9747276eb1
Fixes missing 'else'
2014-05-28 11:47:20 -04:00
mwerezak
d677a91c3c
Adjusts co2 warning frequencies
2014-05-28 10:59:02 -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
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
Zuhayr
3b3bd5649d
Merge pull request #5024 from Jarcolr/Cargo
...
Adds 21 new crates and a tweak
2014-05-28 01:21:24 +09:30
Jarcolr
049b9cc447
Fixes and a suggested change
...
Fixed N2O typo, Super Pacman, anchor issues, inflatable barrier issues
that was already on master so this doesn't conflict, and added a new box
for shotgun shells and adjusted price of crates accordingly
2014-05-27 17:15:17 +03:00
mwerezak
32f6d89bea
Completed unfinished species.breath_type switch
2014-05-27 03:00:31 -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
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
Jeremy Liberman
aefb1cbc05
Secret Mutiny Mode backstory easter egg
2014-05-26 01:00:33 -05:00
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
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
mwerezak
1853533ec2
More SM tweaks based on playtesting
2014-05-24 10:55:41 -04:00
mwerezak
0f59d4d353
Adds cap on SM damage rate
2014-05-24 00:22:32 -04:00
mwerezak
7a6990c5a6
Adjusts SM collection factor
...
Aiming to make 400 kW the new equivalent of 4 MW
2014-05-23 23:35:56 -04:00
mwerezak
92c5711a24
Fixes SM radiation range
...
Was set ridiculously low, so much so that it would never be greater than
1 tile.
2014-05-23 23:32:58 -04:00
mwerezak
7364edbb3d
Adds COLLECTION_FACTOR for future tweaking
2014-05-23 23:16:11 -04:00
Loganbacca
e09740b089
Ore box verbs
...
- Added custom examine verb
- Added empty ore box
- Removed browse interface
2014-05-24 14:14:04 +12:00
mwerezak
ff61384e07
Fixes the way heat_capacity is handled.
2014-05-23 21:49:13 -04:00
mwerezak
2123f27142
SM in space tile produces rad and hallucination
2014-05-23 21:16:56 -04:00
Ccomp5950
3b8ee547c6
Merge pull request #5046 from mwerezak/lightbulb-box
...
Fixes #5043
2014-05-23 17:51:05 -05:00
Ccomp5950
4f1d786a01
Merge pull request #5041 from mwerezak/folded-bags
...
Fixes bodybags not being able to be put back into their own box
2014-05-23 17:50:00 -05:00
Ccomp5950
f30814a230
Merge pull request #5040 from mwerezak/siik-tajr
...
Adds secondary languages for species
2014-05-23 17:49:42 -05:00
Zuhayr
240c1ad8fa
Merge pull request #5039 from Ravensdale/filter-pump
...
Removes density from filters and pumps
2014-05-23 21:04:28 +09:30
mwerezak
c4e811829e
Fixes #5043
2014-05-22 18:47:38 -04:00
PsiOmega
a8e4dc045d
Fixes #4816 and nothing else. Cherry picked from #5036 .
...
Creates proper area instances for sections in engineering.
Removes one out of two APCs in the same area in medbay, adds two missing ones.
2014-05-22 23:12:50 +02:00
mwerezak
71ad2b3aae
Fixes bodybags not being able to be put back...
...
...into their own box. Also affects folded cryobags.
2014-05-22 16:44:26 -04:00
mwerezak
9ee3387466
Reverted verb, adjusted color
...
Verb didn't make sense with radio talk. Might need to wait until datum
based speaking is implemented.
2014-05-22 16:34:45 -04:00
mwerezak
87dfeab0f3
Adds secondary languages for species
2014-05-22 16:17:52 -04:00
Ravensdale
3ed9ac7774
Makes it so mixers and filters no longer block mob
2014-05-22 03:00:18 -07:00
Ccomp5950
401f5ff1f8
Holopad now states what it hears, what a revolutionary concept.
2014-05-22 00:30:08 -05:00
PsiOmega
c4f3e3fd67
Fixes #4816 (or attempts to)
...
Creates proper instances of areas in engineering to prevent issues with APCs.
Removes one of the two APCs in the medbay sleeper area.
Corrects a few more places where atmosphere alarms would lower shutters in adjacent but otherwise unrelated rooms.
Adds a camera at the virology entrance to remove a tiny strip of missing coverage that prevented AI from assisting people in and out from viro (perhaps intended).
2014-05-21 22:36:11 +02:00
