Zuhayr
e2a7bd897b
Merge pull request #6228 from PsiOmegaDelta/LockerCapacity
...
Limited locker capacity
2014-09-01 12:17:07 +09:30
PsiOmega
bad2f92e1c
Mobs now requires 15 units of storage in a locker to fit. Allows two mobs in a single typical locker.
2014-08-30 18:06:21 +02:00
PsiOmega
ed28212d22
Adding shower curtains to the various station showers because.. well, it's nice.
2014-08-29 11:08:22 +02:00
Zuhayr
6c9f60349b
Merge pull request #6183 from comma/curtains
...
Added curatins.
2014-08-28 11:09:36 +09:30
Zuhayr
cf68ad7c87
Master to dev merge.
2014-08-27 20:24:07 +09:30
Chinsky
2fe167c453
Added curatins.
...
Opaque non-dense structures.
2014-08-27 02:38:36 +04:00
mwerezak
9859fc0b00
Fixes #6118
2014-08-25 21:02:57 -04:00
Kelenius
a1348faa8c
Cables are now stacks
2014-08-25 18:54:35 +04:00
Zuhayr
b47d91b612
Merge resolution, master into dev.
2014-08-21 12:01:38 +09:30
Graham Lloyd
75305a0ec4
Comfy chair update, makes armrests show up.
2014-08-17 22:48:38 -04:00
Raptor1628
f1c44601e5
Brig Fixes
...
Fixes a few lighting issues, brig cell doors, adds missing berets to the
wardrobe and closes disposals outlet.
2014-08-14 18:26:17 -04:00
GinjaNinja32
b52450f053
Allows wheelchair occupants to drive if the driving mob is incapacitated
2014-08-14 19:24:00 +01:00
PsiOmega
6fffe8e077
Merge remote-tracking branch 'upstream/dev' into Brig2
2014-08-14 08:58:59 +02:00
PsiOmega
2a46b83dce
Adds new items. Source: https://github.com/Baystation12/Baystation12/pull/5928
2014-08-13 09:35:04 +02:00
Zuhayr
f09d1218fe
Master to dev merge.
2014-08-11 17:23:40 +09:30
Graham Lloyd
2c30af6124
Fireaxe cabinet hacking now fails if player moves away
2014-08-04 14:53:33 -04:00
Whitellama
a36becad2b
Wet rag no longer makes noise or hits when wiping down windows (nor does anything with the NOBLUDGEON flag)
2014-08-01 17:05:54 -07:00
Mloc-Argent
d5e9851b62
integrate XGM into the code
...
New turf proc: assume_gas(). Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
more.
Zones now process all fire data and existance in one go, fire objects
only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
structured for the new gas_mixtures.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-07-22 19:52:12 +01:00
mwerezak
1a52aa7b06
Merge remote-tracking branch 'upstream/dev' into op-hideout
2014-07-16 17:41:30 -04:00
Zuhayr
f795712a95
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
2014-07-16 19:30:41 +09:30
Hubblenaut
4ee6b77289
Adds new syndicate closet and adjusts nuke setup
2014-07-15 17:22:03 +02:00
mwerezak
f2845dbe76
Thrown items can be targeted, has miss chance...
...
...based on distance, similar to projectiles.
2014-07-15 01:14:04 -04:00
Kelenius
aad89409de
Slime update
2014-07-13 17:37:30 +04:00
Zuhayr
0d21889bee
Fixed some bugs, did some testing, moved some procs around for robot functionality.
2014-07-11 13:50:34 +09:30
Zuhayr
70ba371658
Merge resolution.
2014-07-11 12:47:16 +09:30
Mloc-Argent
64d2a69a32
Merge remote-tracking branch 'upstream/master' into dev
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/modules/mob/living/carbon/human/human_damage.dm
2014-07-06 17:50:53 +01:00
Zuhayr
21e625d89b
Added Crisis and Surgeon modules, removed Medical module, added Construction module, altered Mining and Engineering modules.
2014-07-05 16:48:59 +09:30
Zuhayr
34d19d16f5
Fffffff fixes crates not budging properly.
2014-07-05 04:17:12 +09:30
Zuhayr
67da4096b3
Fixes #5461
2014-07-04 17:48:01 +09:30
Zuhayr
0c11ebe8e8
Fixes #5490
2014-07-04 17:39:45 +09:30
Hubblenaut
97f997dd30
Fixes in wheelchair and different handling of movement
2014-07-02 22:42:18 +02:00
Mloc-Argent
6630e4838e
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/game/machinery/alarm.dm
2014-06-30 23:44:46 +01:00
Chinsky
a6c7093818
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into robust-squash
...
Conflicts: lots
2014-06-29 19:16:36 +04:00
Higgin
2556d3f227
Stunbatons now run on charge.
...
Adds improvised weapons.
Increases unarmed stun time, decreases push stun time.
Increases melee embedding chance.
2014-06-29 17:46:06 +04:00
Zuhayr
922e425a33
Fixed moving between tables freely.
2014-06-29 10:46:31 +09:30
Zuhayr
c7e9e1aa2a
Fixed It won't budge! from crates, added drag and drop for table climbing, added Adajcent check to table climbing.
2014-06-29 09:40:37 +09:30
Jarcolr
14818b312a
Psychiatrists couch
2014-06-27 22:38:57 +03:00
Jarcolr
dda6ef82bd
Psych bed >> Freudian couch
...
Vetinarix kept the icon_state name when the Medbay Renovation PR thing got in. Malsquando wanted this changed.
2014-06-27 10:22:05 +03:00
PsiOmega
906ef41522
The tactical closet now calls ..() in its New() proc, allows for swallowing items placed on-top among other things.
2014-06-25 18:32:48 +02: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
a5c2af7a57
Shuffling around table and crate knock/climb procs.
2014-06-24 11:11:02 +09:30
Zuhayr
7fe8a89e58
Makes table/crate falling a bit more dangerous.
2014-06-24 07:17:24 +09:30
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
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
Zuhayr
65013ac5a1
Merge pull request #5325 from mwerezak/temperature-expose
...
Fixes FEA temperature_expose() being used instead of ZAS fire_act().
2014-06-23 00:19:15 +09:30
Zuhayr
183ee20ab6
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-06-22 21:58:30 +09:30
mwerezak
37e63dfcb0
Fixes FEA temperature_expose() being used...
...
...instead of ZAS fire_act().
2014-06-22 00:13:22 -04:00
Chinsky
b7832f862a
Fixes #5311
2014-06-21 00:58:31 +04:00
Hubblenaut
8a4739197e
Merge branch 'backup' into medical
2014-06-19 15:36:28 +02:00
