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
18,937 Commits 5 Branches 0 Tags
0090efb21026c84ce846e3b3df11c607c20e8e0a
Commit Graph

4155 Commits

Author SHA1 Message Date
Zuhayr
9c5fe5d9f3 Merge pull request #5106 from Zuhayr/master 
Drone fixes.
 2014-06-01 02:08:30 +09:30
Zuhayr
a3be005113 Adds a drone spawn blurb. 2014-06-01 02:05:25 +09:30
Zuhayr
273f729eee Several drone fixes (walking over, pushing, pulling, AI sync) 2014-05-31 22:28:05 +09:30
Ccomp5950
b6b4d0826f Ghost dsay verbs. 
Now a bit more accurate.
 2014-05-31 02:33:51 -05:00
Chinsky
189c160c07 Merge pull request #5092 from Ravensdale/dev-freeze 
Fixes accidental renames during Phoron project
 2014-05-31 05:22:07 +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
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
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
Zuhayr
045168ba17 Merge pull request #5082 from mwerezak/inaprovaline 
Inaprovaline no longer a substitute for breathing
 2014-05-29 11:19:18 +09:30
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
Zuhayr
8f50fbcd3b Fixes #4940 2014-05-28 17:00:31 +09:30
Zuhayr
c2b97b7fcb Fixes #4643 2014-05-28 16:41:54 +09:30
Ccomp5950
4bb59352f5 Merge pull request #4968 from MrLeebo/mutiny 
Mutiny Mode
 2014-05-28 00:13:42 -05: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
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
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
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
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
Hubblenaut
4aff667d69 Spelling correction: It's called 'Accessory', not 'Accessoires'. Dang. 2014-05-23 23:23:25 +02:00
Hubblenaut
5736200d18 Strip interface changes: Accessories, Pockets, Suit Sensors 2014-05-23 17:56:27 +02: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
mwerezak
ca264a8636 Proper verb and style for Siik'tajr 2014-05-21 00:39:17 -04:00
Jeremy Liberman
a95a28e303 Merge branch 'dev' into mutiny-fixes 2014-05-18 11:25:36 -05:00
Zuhayr
56bdd108f9 Cleaned up holders a bit, added show_message() proc to them, added loops in custom_emote to show emotes to things in inventories with the right flag. 2014-05-18 10:59:47 +09:30
Zuhayr
e3f0bcd118 Adds PASSEMOTES flag to setup.dm, dionaea and borers. 2014-05-18 10:50:13 +09:30
Ccomp5950
7c1d8b32d0 Humanoid mobs won't default to having an undershirt. 2014-05-17 16:01:49 -05:00
mwerezak
9a7c53d7d1 Fixed NONVERBAL check. 2014-05-17 15:43:10 -04:00
mwerezak
c4c962d582 Allows robots to use languages over the radio 2014-05-17 15:19:33 -04:00
mwerezak
4e638ef92b Fixes being able to understand NONVERBAL... 
...languages when blind.
 2014-05-17 15:19:12 -04:00
mwerezak
7cacc02ae3 Fixes bad operator precendence in robot... 
...language checks, and removed universal_speak from robots.
 2014-05-17 15:18:36 -04:00
mwerezak
c0610c37bc Allows using language while whispering using :w 2014-05-17 15:16:16 -04:00
mwerezak
c44f11b0e5 Fixes language_keys not initialized correctly 
Also prevents speech ending verb from overriding language verb for
humans.
 2014-05-17 14:38:11 -04:00
mwerezak
d8ca221c44 Adds Siik'tajr 2014-05-17 08:51:57 -04:00
mwerezak
7d1c5e7824 Adds non-verbal languages 2014-05-17 08:51:35 -04:00
mwerezak
7914a585a4 Removed verb assignment from hear_say() 
This gives more control over the verb to procs that use hear_say(). Also
they were already assigning the language specific verbs to begin with.
 2014-05-17 08:51:13 -04:00
mwerezak
d831ef53cd Whisper now supports languages 2014-05-17 08:50:50 -04:00
mwerezak
7b20947802 Added speech synthesizer list for silicon mobs 2014-05-17 08:50:28 -04:00