cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,047 Commits 9 Branches 0 Tags
2218164df9027d704696e85bc6d2f2bc48d50ba0
Commit Graph

13417 Commits

Author SHA1 Message Date
Loganbacca
2218164df9 Bug fix and mapping example 
- Fixed mapped omni devices being set to off at round start
- Remapped the research outpost atmos room, taking advantage of omni devices
 2014-06-26 21:10:17 +12:00
Loganbacca
9c80541936 Mapper sanity checks 
- Checks that mapped values add up to 100% so mappers can't set unusual ratios
 2014-06-26 15:40:10 +12:00
Loganbacca
5af82714b2 Omni device tweaks 
- Better mapping support (mapping icons and can now set mixer concentration)
- Trimmed overlay lists
- Utilized existing procs for icon generation
- Changed filter icon color to better contrast the output color
 2014-06-26 14:55:53 +12:00
Loganbacca
71ff9f7671 Add omni devices to dispenser 
- Added omni filters and mixers to pipe dispenser
- Added construction code
- A couple more cosmetic tweaks
 2014-06-25 23:17:45 +12:00
Loganbacca
095ab7d97c Added omni filters 
- Added omni gas filter
- Cleaned up some code in mixer.dm and omni_base.dm
 2014-06-25 23:17:44 +12:00
Loganbacca
4d4947021e Atmos Overhaul - Phase 1 
- Implements omni device core framework
- Adds omni gas mixer
 2014-06-25 23:17:44 +12:00
Loganbacca
493ecdeb9e Pipe fixes 
- Cleans up silent pipe deleting (now creates a loose pipe item where the pipe section was)
- Allows pipe painters to paint disconnected pipes
- Removes OOC message from IC feedback
 2014-06-25 23:17:44 +12:00
Zuhayr
30bf9302d6 Update cat.dm 2014-06-25 19:57:15 +09:30
Zuhayr
808ca3aea4 Merge pull request #5355 from comma/holder 
Moved scooping into a separate helper.
 2014-06-25 19:55:24 +09:30
DJSnapshot
ba404cf602 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into laptop 2014-06-24 16:38:38 -07:00
Zuhayr
5c002d3701 Changed cryo message a bit. 2014-06-24 21:18:47 +09:30
Zuhayr
4e673d047e Merge branch 'spawnpoints' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-24 19:22:18 +09:30
Chinsky
481f3caec5 Moved scooping into a separate helper. 2014-06-24 13:46:15 +04:00
Chinsky
4da1a5302e Merge pull request #5354 from Zuhayr/cattes 
Made cats pickupable.
 2014-06-24 13:12:01 +04:00
Chinsky
8c67326576 Merge pull request #5331 from UristMcKerman/pipeturbine 
Pipe Turbine
 2014-06-24 13:08:11 +04:00
Chinsky
d96a901ea0 Merge pull request #5342 from Zuhayr/dev 
Allows climbing onto tables and crates, also adds falling off if you are...
 2014-06-24 13:05:17 +04:00
Zuhayr
b67bb6470d Made cats pick-up-able. 2014-06-24 14:41:08 +09:30
Zuhayr
2262661549 Ravensdale thinks the gateway has lore problems, commenting it out of spawn. 2014-06-24 14:03:11 +09:30
DJSnapshot
4c00b292d0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into laptop 2014-06-23 21:26:55 -07:00
DJSnapshot
f2db8ed909 Merge pull request #5344 from Hubblenaut/dev 
Moves the non-implanted security positions from restricted to protected ...
 2014-06-23 21:22:59 -07:00
DJSnapshot
93ccad2a82 Merge pull request #5343 from Mloc/bs12-burn 
Fire buffs, wall damage
 2014-06-23 21:22:32 -07:00
Zuhayr
df99c59389 Removed pointless option on cryopod. 2014-06-24 13:44:52 +09:30
Zuhayr
abc07e435c Minor formatting fix. 2014-06-24 13:41:59 +09:30
Zuhayr
96bbe1d9db Added spawnpoint datum, moved existing latejoin spawn to datum setup. 2014-06-24 13:33:48 +09:30
Zuhayr
b63708577b Merge pull request #5345 from comma/monkey_revenge 
Monkey cube now expand when eaten, leading to !!FUN!!
 2014-06-24 11:41:33 +09:30
Zuhayr
a5c2af7a57 Shuffling around table and crate knock/climb procs. 2014-06-24 11:11:02 +09:30
Chinsky
6393cb15d8 Merge pull request #5332 from mwerezak/wound-infections 
Gives the suit coolers a proper process() proc
 2014-06-24 05:32:47 +04:00
Chinsky
4cd4217488 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into monkey_revenge 
Conflicts:
	code/modules/organs/organ_external.dm
 2014-06-24 04:22:28 +04:00
Chinsky
3ff6c41846 Made monkey cube subtypes define what type of monkey they spawn instead of weird switch in Expand(). 
Rewrote belly expanding accordingly. Also now you get a living monkey from the monkey.
 2014-06-24 04:19:09 +04:00
Chinsky
ece48ae0c4 Moved same code into single organ helper to handle embedding. 2014-06-24 04:09:35 +04:00
Chinsky
b2b9907605 Lowers caused damage to make it destroy organs rarer. 2014-06-24 03:56:34 +04:00
Chinsky
e3930fa79e Monkey cube now expand when eaten, leading to !!FUN!! 2014-06-24 03:42:23 +04:00
DJSnapshot
0ac199f92d shuttle controller fix 2014-06-23 15:15:53 -07:00
Hubblenaut
4868c7337c Moves the non-implanted security positions from restricted to protected list, adds IA Agent to restricted. 2014-06-24 00:12:58 +02:00
DJSnapshot
7a3bee3823 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into laptop 2014-06-23 15:06:02 -07:00
Zuhayr
7fe8a89e58 Makes table/crate falling a bit more dangerous. 2014-06-24 07:17:24 +09:30
DJSnapshot
c007b013d0 Clicking the magnetic card slot option on the desktop will eject all cards. No more eating cards! 2014-06-23 14:43:43 -07:00
Mloc-Argent
1aca3fe7f2 atmos: make fires more destructive 
Fires can now burn through walls, windows, and (with a high enough
 temperature) rwalls.
New proc: adjacent_fire_act().  Called on turfs that a fire isn't able
 to spread to. (walls, floor surrounded by windows, etc.)

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-06-23 20:58:14 +01:00
Mloc-Argent
6d0098c4fb turf: adds a damage model for walls 
New proc for walls: take_damage().
Damage is tracked in the "damage" var, walls will break if "damage"
 hits "damage_cap".
Damage can be repaired with a weldingtool.
Damage overlays are cached in the global wall var "damage_overlays"
 to reduce overhead.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-06-23 20:58:12 +01:00
Mloc-Argent
da89c36cde atmos: fix a geometry error 
reverse_dir is a list of reversed dir fields

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-06-23 20:58:10 +01:00
Mloc-Argent
a33cb7272b Merge remote-tracking branch 'upstream/master' into dev 2014-06-23 20:57:47 +01:00
Zuhayr
8fe013d531 Allows climbing onto tables and crates, also adds falling off if you are dumb enough to stand on one that is flipped or opened. 2014-06-24 03:21:27 +09:30
mwerezak
6b3c130702 Removes dynamic proc call 2014-06-23 10:55:03 -04:00
Mloc
db248dbd84 Merge pull request #5335 from Loganbacca/trainfix 
Cargo train update
 2014-06-23 14:03:11 +01:00
Mloc
8ca382f362 Merge pull request #5338 from Loganbacca/devfix 
Fixes incorrect cable coil colours
 2014-06-23 14:02:46 +01:00
Zuhayr
a6f64ccd9c Merge pull request #5330 from mwerezak/emergency-shuttle 
Updates emergency shuttle controller to use shuttle datums
 2014-06-23 21:19:36 +09:30
Loganbacca
d1a729f5db Fixes incorrect cable coil colours 2014-06-23 21:44:51 +12:00
DJSnapshot
db6a403c2f uses get_turf instead of get_turf_loc now 2014-06-23 02:09:17 -07:00
DJSnapshot
d8ef1647a7 Forgot to commit welcome.dm 2014-06-23 01:54:03 -07:00
Loganbacca
3aa3c4166c Cargo train update 
- Cleans up some old code
- Fixes some bugs
- Adds keys to start the engine
 2014-06-23 19:53:58 +12:00