Commit Graph

14255 Commits

Author SHA1 Message Date
skull132
37fa1e947e Implement Vaurca mob tests (#1244)
Also fixes Vaurca having NO_BREATHE flag on accident.
2016-12-19 00:16:10 +02:00
Alberyk
2c6dad2dd3 More bay merge fixes (#1243)
- Fixes #1227 
- Fixes #1236 
- Re-add lamarr.
- Fix bootknife thing
- Fix a couple of things related to borgs
- Re-add our tator items
- Adding back all the hardsuit modules back to robotics
- Fixing a couple of missing sprites, like fireaxe cabinet
- Fixed missing computer sprites when no power
2016-12-18 22:13:42 +02:00
skull132
535919aaa7 Coerce the unit tests (#1241)
Updates the unit tests to reflect our codebase, and not Bay's.

Also disables the indentation test until further notice, because it's dumb in its present form and function. Creates more trouble than it's worth.
2016-12-18 21:39:53 +02:00
skull132
c7352e45a5 Unit tests - Tag matcher (#1237)
Clears out all bad HTML tags noted by the tag matcher unit test.
2016-12-18 11:54:05 +02:00
Alberyk
89ae849adc Bay merge fixes (#1225)
What is being fixed:
-messed up sec armor
-skeleton, vox and resomi being player species
-abhumans also had restrictions added until whatever should be done with them was decided or something
-fixing dionae language name
-fixing bluespace suicide and some additions/changes
-fixing random vaurca name gen thing
-fixing missing ipc chest and groin sprites
-added missing resomi hair and some new dank vox hair styles
2016-12-18 10:52:16 +02:00
skull132
4687b7d2e6 Fix language more 2016-12-18 01:27:32 +02:00
skull132
f3b42ad1d8 Rootsong -> LANGUAGE_ROOTSPEAK 2016-12-18 01:18:41 +02:00
skull132
9b094ad0eb Merge branch 'upstream/development' into development
# Conflicts:
#	code/_helpers/time.dm
#	code/game/objects/items/devices/floor_painter.dm
#	code/game/objects/items/stacks/medical.dm
#	code/global.dm
#	code/modules/cargo/randomstock.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/paperwork/faxmachine.dm
2016-12-18 01:06:45 +02:00
skull132
0b26cd9ab1 Fix more things 2016-12-18 00:42:49 +02:00
skull132
1bf9e6a389 Fix all the things
YAAAAY!
2016-12-15 14:22:08 +02:00
Werner
2c9203951f Overhauls stats gathering to include the game_id (#1211)
Changed Stats gathering to include game_id.
Removed a duplicate proc that's never used.

This introduces a breaking chance in the feedback table.
The table should be renamed and recreated with the new schema.
2016-12-12 23:15:09 +02:00
skull132
16bf480525 Clean-up time!
Removing worthless files.
2016-12-11 21:45:21 +02:00
skull132
ff7f93cbd8 Saving + Updating + ALL THE THINGS
Everything. Absoloutely positively everything. Fuck.

Hey, it compiles now, doe!
2016-12-11 21:44:35 +02:00
skull132
5fbd15a846 Job sanitization
Because I forgot, K? Will runtime because I haven't added the second var yet but sure. Yay.
2016-12-11 01:39:00 +02:00
skull132
2b63c7e394 SQL Saves - Loading more vars
Forgot to load some of the new vars.
2016-12-11 00:35:58 +02:00
skull132
57501a305c SQL Loading - preferences vs character
A simple whitelist so we don't end up running bad queries when we only want the character.
2016-12-10 23:28:35 +02:00
skull132
7925063160 SQL Saves - Sanitization
Everything is now proper good sanitized!
2016-12-10 19:48:00 +02:00
skull132
7c8e6f730e Finalize loading queries
No more compile errors or logic errors from these.
2016-12-10 17:04:39 +02:00
skull132
00a2067bf7 Merge branch 'development' into merge/sql_saves_new 2016-12-10 15:35:10 +02:00
LordFowl
c46ae8cb42 Christmas Update (#1203)
Several minor mapping changes, basically accounting to stringing up christmas lights and wreaths. Some chairs and tables were removed to make way for glorious Christmas Tree. May their sacrifices be well remembered.
2016-12-06 17:01:21 +02:00
Bedshaped
48f9c995b6 FINISHED ALL NON-PREF ERRORS (#27)
* code\game\machinery\cryopod.dm:482:error: orient_right: undefined var

* code\modules\mob\mob_movement.dm:272:error: mob.last_move_intent: undefined var

* code\modules\mob\living\simple_animal\simple_animal.dm:377&402:error: user.changeNext_move: undefined proc

* code\modules\mob\living\silicon\robot\robot_items.dm:31:error: loaded_item.reliability: undefined var

* fixes whatever to do with chameleon.dm

* camera.dm

* didn't get chameloeon the first time round

* uplink.dm

* code\game\objects\items\devices\PDA\PDA.dm:959:error: U.last_target_click: undefined var

* code\modules\clothing\head\misc_special.dm:159:error: icon_head: undefined var
2016-12-04 19:39:20 +02:00
Alberyk
80bc02346e Custom items 25/11 (#1184)
Some items that were never made due to the lack of sprite/being hard as fuck to sprite/i forgot. Special thanks for TheGreatJorge for being a based spriters and getting those done.

Medizinercorps armband - Karl Jonson - arrow768
Ceremonial Whip - Rook Jameson - hivefleetchicken
Black Labcoat - LiLITH - ladyofravens
Jeweled Tiara - Sayyidah Al-Kateb - alberyk

Also, removing xelnaga's implant, at his request.
2016-11-30 22:17:13 +02:00
Werner
a1a1d6c17e Some more bug fixes (#26)
Some more bugfixes.
The Windoor changes from Nanakos pull might conflict.
So merge that first and I´ll resolve as needed.
2016-11-30 18:30:06 +02:00
NanakoAC
f7476fa9d7 Nanako's compile fixes (#25)
Various compile error fixes. windoor stuff, ID, emag, holders marked for farther fixing later.
nothing too remarkable
2016-11-30 18:28:58 +02:00
Alberyk
5bfa01d79e Syndicate borg fix mk II and bees. (#23)
Reverting back to old code, but, now fixing all the issue, and fuck ghost trap for this for now.

Also, re-adding our unique murderous bees.
2016-11-27 20:00:35 +02:00
skull132
a0aa10837e Reduce more compiles 2016-11-27 18:34:26 +02:00
Bedshaped
924507246d Clearing compiles (#22)
I gave IS_SYNTHETIC the same value as it has on our repo, hopefully that lazy fix is okay. I didn't want to search trhough where it's usually first assigned
2016-11-22 22:21:35 +02:00
NanakoAC
879f3faef8 Istype (#20)
Fixes a couple of is errors with missing functions.
Added isDrone as macro

restored the various is non macro functions. i don't know how or if they could be macro-ized
2016-11-22 20:25:28 +02:00
Alberyk
e1b604df92 More fixes (#21)
Removing some meteorhit procs and reliability related changes.
2016-11-21 18:11:36 +02:00
Alberyk
de74140f89 Fixing mechanical traps and portable flashers (#1173)
Traps will trigger don't matter if you are walking or running, same with portable flashers.

Also, fixing a missing shotgun box sprite and a the wrong gun in the supply cargo crate.
2016-11-21 12:06:51 +02:00
Alberyk
9803e14486 Custom items 20/11 (#1171) 2016-11-21 12:05:31 +02:00
skull132
cc1d254b6a Partially implement loading
TODO: sanitization
2016-11-21 01:01:40 +02:00
skull132
e6c4b2a648 Merge branch 'development' into merge/sql_saves_new 2016-11-20 20:37:42 +02:00
skull132
f8ab076794 Runtime fixes for life() (#1172)
Basically, missing safety checks. Apparently blood_dna is conditionally defined and filled out. This should stop some surprisingly common runtime errors from life() that we've been seeing.

Bypassed review.
2016-11-20 18:21:41 +02:00
NanakoAC
8181c3e15d Nymph hats (#15)
Resolves five compile errors with nymphs wearing hats.

Nymphs can wear hats now.
I added a todo so we dont forget to test it out
2016-11-20 14:27:21 +02:00
NanakoAC
cdb38b03eb Updateicons (#16)
Fixes a couple compile errors with human/update_icons
2016-11-20 13:23:34 +02:00
Werner
a878524089 Baymerge fixes (#13)
86 errors
2016-11-19 18:56:00 +02:00
Alberyk
65aa5ec4f0 Syndicate borg spawner upgrade (#11)
This time using the ghost trap system from bay, this may not work, but it is clearing some errors related to those dm in particular.
2016-11-19 18:55:21 +02:00
NanakoAC
92d442b9f0 Fixes some issues and reverts some changes to cyborgs (#14)
Removed cyborg RCD upgrade
Fixed tox mod
Fixed four sound pref defines
2016-11-19 18:54:51 +02:00
Werner
ab413348ff Baymerge fixes (#12)
* Fixing compile errors

* Some more fixes

* Some more fixes
2016-11-19 11:56:49 +02:00
Alberyk
908fc933f9 Fixing more error and the return of banhammer (#10) 2016-11-18 23:03:56 +02:00
NanakoAC
182d4375be Animal healing fix (#1162)
Fixes animal healing with food, which i broke a couple patches ago, and healing animals with medical kits, which has never really worked right

I tweaked the heal values on the kits slightly, this wont make much difference to healing humans, only to healing animals.
Also added a doafter thing to make it a tiny bit more involved.

Also adds a little text for animals to make it visible on examination if they're wounded
2016-11-18 22:03:43 +02:00
NanakoAC
265b56d925 Fixes #1129 (#1169)
Fixes going crazy speed when pushing a wheelchair
This is a quick fix for now
2016-11-18 22:02:31 +02:00
Bedshaped
5cddb85f6e Fixes #1164 (#1166) 2016-11-18 22:01:24 +02:00
NanakoAC
59a12335bd Cargo Tweaks (#1157)
Adjusts some more weights and probabilities on cargo items that affect balance.

Fixes adminordrazine spawning.
Tweaks sprinting values a little more. Iterative design!
2016-11-18 21:59:46 +02:00
skull132
f7f2e72069 Pass 1 2016-11-18 18:05:32 +02:00
Werner
3e92d63ddf Fixing compile errors (#9) 2016-11-18 18:03:27 +02:00
Alberyk
38a0033b2e Fixing compile errors (#8)
* Fixing more errors

* Update baystation12.int
2016-11-12 12:47:43 +02:00
skull132
f75e1f3cca Indentation clearance + basic compiles
Due to missing includes, primarily.
2016-11-12 01:02:50 +02:00
skull132
ee68f3c9d0 Final merge
Merge branch 'development-2' into development

# Conflicts:
#	baystation12.dme
#	code/_helpers/icons.dm
#	code/controllers/master_controller.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/computer3/laptop.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/floorlayer.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/mech_fabricator.dm
#	code/game/objects/effects/decals/contraband.dm
#	code/game/objects/explosion.dm
#	code/game/objects/items/robot/robot_upgrades.dm
#	code/game/objects/items/weapons/melee/misc.dm
#	code/game/objects/items/weapons/storage/boxes.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/window.dm
#	code/modules/clothing/spacesuits/rig/rig.dm
#	code/modules/clothing/suits/jobs.dm
#	code/modules/mob/freelook/update_triggers.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/human_movement.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/species.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/projectiles/ammunition/boxes.dm
#	nano/templates/sleeper.tmpl
2016-11-12 00:10:21 +02:00