Commit Graph

578 Commits

Author SHA1 Message Date
mwerezak 604ad08f07 Fixes #6820
Readds missing check, makes hoverpods their own mech type and moves them
to another folder.
2014-10-22 00:15:42 -04:00
GinjaNinja32 c585a97162 Let's actually use these barsign sprites. 2014-10-20 23:58:26 +01:00
Zuhayr cd2b5e761d Fixes being unable to knock on windows. 2014-10-13 11:21:37 +10:30
Zuhayr 9b23315359 Fixes #6644 2014-10-11 07:44:48 +10:30
Gamerofthegame a47ec82103 Merge repair 2014-10-03 16:04:31 -04:00
Zuhayr 6c96f3d66b Merge branch 'xenorewrite' of https://github.com/Zuhayr/Baystation12 into dev 2014-10-02 02:39:37 +09:30
Zuhayr 305416d5c5 Merg resolution. 2014-10-02 02:33:06 +09:30
Zuhayr 3f05362577 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenorewrite 2014-10-01 18:16:04 +09:30
Chinsky 165bbadc10 Merge pull request #6551 from RavingManiac/dev
Space floating effect
2014-10-01 10:01:25 +04:00
Mloc-Argent 6fb1667b44 fixes #4742
not a full fix, there's too many small cases where OPENCONTAINER
isn't checked, but this is everything in the report

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-09-30 20:52:00 +01:00
Mloc 7a0b0c4369 fixes #6115
Signed-off-by: Mloc <colmohici@gmail.com>
2014-09-30 20:39:11 +01:00
RavingManiac c4875e7d36 Floating effect now uses animate() instead of pixel_y while loop thingy.
Distinct actions that indefinitely change a mob's pixel_y or pixel_x, like strapping someone to a roller bed, should also alter new variables old_y or old_x accordingly. This means that floating and jittering animations no longer interfere, as the animations use old_x/old_y as the "base" position.

Entering areas with gravity from areas without grabity now removes floating effect.
2014-09-30 22:37:48 +08:00
Zuhayr 70eedc3486 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenorewrite 2014-09-30 12:18:16 +09:30
Gamerofthegame 33b9d19df1 Commit repair 2014-09-28 17:13:42 -04:00
Zuhayr 803c5c557e Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenorewrite 2014-09-29 06:21:49 +09:30
Zuhayr 223bd86f18 Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev
First pass on major conversion of xenomorphs to a human subspecies. Additional condensing of various redundant mob verbs.
Converted larva and diona to their own class, collapsed the rest of xenomorphs into a human species, other stuff.
Completely removed attack_alien(). Still have to reimplement some of the lost behavior for human/alien.
Reapplies lost attack_alien() functionality other than tackling/caressing.
Further alien/humanoid cleanup and xenospawn fix-ups. Also uncommented caste verbs.
Removed half-finished abilities system since species.dm handles it.
All xenomorphs functionality should be working now, other than the HUD, tackling and the xenomorph balance issues.
Added icons for xenomorph castes, moved broadcast languages into datums, removed alien_talk and robot_talk vars.
Merged with organ removal code.
Reapplied verbs to simple_animals/slimes. Updated species definitions to have appropriate organs.
Readded tackle as a human verb.
Borer changes regarding brain removal.
Working on moving the human HUD to the species datum a bit. Mixed results.
Moved Cortical Link to a language, added borer husks.
Tidied up the HUD stuff. Still need to make it rebuild properly when species is changed, but this will do for no
Compile fix, forgot the DME.
Fixed up ventcrawl, added new organ mechanics for dionaea.
Fixed up some overlooked sections causing mobs without brains to die immediately.
Fixed up plasma generation for queens, bugs with organs, force_organ issues with set_species().
2014-09-29 06:19:26 +09:30
Hubblenaut 109ef9ac89 Adds gambling tables 2014-09-28 21:48:57 +02:00
Zuhayr cc52be3192 Merge resolution, replaced 2 wires lost in map merge. 2014-09-25 23:54:24 +09:30
Zuhayr 86ce5c19e2 Fixes #6495 2014-09-25 18:33:42 +09:30
Zuhayr 0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
Zuhayr 1eb759447e Merge resolution, using dev-freeze map due to unreconcilable conflicts. 2014-09-13 16:54:48 +09:30
Mloc-Argent 712e209ab6 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm
2014-09-10 22:14:37 +01:00
PsiOmega 264504c595 Showers now cause wet floors. Mops can now be used to clean shuttles (non-simulated floor). 2014-09-04 16:36:26 +02:00
PsiOmega e4bffb2d76 Limits body/cryo bags to a single mob. 2014-09-03 10:43:04 +02:00
Zuhayr 67cb6e297e Merge pull request #6254 from Kelenius/OfStacks
Of Stacks
2014-09-02 17:58:28 +09:30
Kelenius 505f857eb8 Stack update 2014-09-02 09:59:32 +04:00
Zuhayr 74d9b1bf2d Fixes #6178 2014-09-01 22:15:45 +09:30
Zuhayr e2a7bd897b Merge pull request #6228 from PsiOmegaDelta/LockerCapacity
Limited locker capacity
2014-09-01 12:17:07 +09:30
Whitellama dae602a2ec Fixes tank dispenser sprite not updating icons when a tank is added 2014-08-31 15:22:13 -07:00
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 772715f2da Merged dev-freeze into master. Two map conflicts, used dev-freeze map. 2014-08-27 20:46:04 +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
Chinsky 2c73f3b2d5 Merge pull request #6107 from mwerezak/dev-fixes
Fixes rad suits not completely protecting against radiation
2014-08-24 01:58:26 +04:00
mwerezak ababfc1d0c Merge remote-tracking branch 'upstream/dev-freeze' into dev-fixes
Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
2014-08-22 01:24:34 -04:00
mwerezak 1477fe17ab Fixes apply_effect() used without armour checks 2014-08-22 00:02:50 -04:00
Raptor1628 5a030ac82b Brig Fixes Clean
Includes all the previous fixes, plus removes loyalty implants from HoS
locker
2014-08-21 20:58:00 -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