Commit Graph

14247 Commits

Author SHA1 Message Date
Kearel 10359889e7 Fixes
Slight change to airflow/animations interaction when buckled
2015-08-04 13:41:27 -05:00
GinjaNinja32 117ffca6d0 Merge pull request #10423 from Kelenius/ofBotsAndZAS
Of bots and ZAS
2015-08-04 13:26:30 +01:00
GinjaNinja32 9a4b53c765 Merge pull request #10360 from atlantiscze/beep-beep-beepsky
Fixes #10355
2015-08-04 12:36:35 +01:00
PsiOmegaDelta 93011f94c4 Merge pull request #10425 from Baystation12/dev-freeze
Dev
2015-08-04 13:07:11 +02:00
Kelenius e935baf1d8 Fixes #10418 - bots don't remover from stuns 2015-08-04 12:41:32 +03:00
mwerezak d1bd146b1a Changes reinforced glass material name
Gives the reinforced glass material a name that is easier to verify for
correctness.
2015-08-03 23:01:34 -04:00
Neerti 95240c989b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/3/2015_bay_sync
Conflicts:
	polaris.dme
2015-08-03 22:13:18 -04:00
Kearel f50e140941 Bike 2015-08-03 20:54:12 -05:00
GinjaNinja32 70c302ad03 Merge pull request #10415 from PsiOmegaDelta/150803-LightingRuntime
Fixes #10409.
2015-08-04 00:47:11 +01:00
GinjaNinja32 a099fc4401 Merge pull request #10413 from PsiOmegaDelta/150803-Cleanup
Removes debug proc.
2015-08-04 00:46:40 +01:00
mwerezak 76ceaa904b Fixes admin or event spawned antags not spawning
Pending players were selected but the antag roles were never finalized.
2015-08-03 12:06:23 -04:00
RavingManiac aeea42ded9 Refactors floating and magboot checks. Fixes #10256 2015-08-03 23:19:04 +10:00
PsiOmegaDelta c25212463a Fixes #10409.
Ports https://github.com/ParadiseSS13/Paradise/pull/1622.
2015-08-03 10:15:24 +02:00
PsiOmegaDelta 34ad83baae Removes debug proc.
It isn't needed.
2015-08-03 09:31:40 +02:00
Atlantis ad45e5d16b Implements req_one_access for bots, as per request on GitHub discussion. 2015-08-02 23:23:18 +02:00
GinjaNinja32 d050606665 Changes tables to rotate correctly with client.dir 2015-08-02 15:03:42 +01:00
mwerezak 8f4394266b Fixes not being able to insert a complete stack into the protolathe
The call order meant that if you tried to insert a complete stack, use()
would qdel the stack causing do_after() to fail.
2015-08-02 00:26:30 -04:00
mwerezak 0ceb0e291d Fixes #10314
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
2015-08-02 00:01:10 -04:00
mwerezak e3609bac94 Adds common proc to obtain the material of an object
Adds a common get_material() proc to objects, and implements overrides
where applicable
2015-08-01 23:03:21 -04:00
PsiOmega f8d86900a5 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
	code/setup.dm
2015-08-01 19:45:42 +02:00
PsiOmegaDelta f8799035f4 Merge pull request #10400 from Baystation12/master
Master -> Dev-Freeze
2015-08-01 19:44:22 +02:00
mwerezak f2bfc5a720 Merge pull request #10397 from Zuhayr/dev-freeze
Fixes
2015-08-01 13:02:23 -04:00
GinjaNinja32 495f80fff6 Change callproc to check validity earlier
Callproc now checks validity of a call *before* prompting for arguments, instead of after, and can now check the validity of global (/proc/foo) procs.
2015-08-01 17:19:36 +01:00
Zuhayr 71433e024d Merge pull request #10388 from mwerezak/light-suit
Cybersuit and sprite fixes
2015-08-02 01:13:46 +09:30
Zuhayr 840b5b756b Fixes #10358, #10359 and #10257 2015-08-01 23:17:27 +09:30
Zuhayr 2a51b778d6 Fixes #9611 2015-08-01 21:10:48 +09:30
Mloc f04ca77bfb revert chargen rendering rework
fixes #9733

Signed-off-by: Mloc <colmohici@gmail.com>
2015-08-01 11:35:53 +01:00
Neerti 2193ff9549 Merge pull request #56 from Woodratt/Woodrat_Work_5
Commit verison v5 Pre-Alpha Playable Release
2015-08-01 03:19:15 -04:00
Woodrat 2420f05034 Commit verison v5 Pre-Alpha Playable Release
Changes -

- Research
  - Work finalized on Research, all extra items such as newscasters, alarms, fire extinguishers added. Cargo drop of point added Door access completed, landmarks and spawn points added, floor painted. No further major changes to be made to research.

- Cargo
  - Work finalized, One new area added (second one to be added at a later date but causes no issues at this point). No major changes to be done to cargo at this time.

- Security
  - Work finalized, brig cells work properly, cargo drop off point made, cameras added, blastdoors working properly, no major changes to be made.

- Medical
  - Work finalized, hallways painted, shutters working properly, cameras added, virolocks functional. Cargo drop off point to still be added. No major changes to be done.

- Command
  - Work in Progress, door access done including AI and AI upload, landmarks added, few light changes such as additional lights to the bridge. No major changes to be done

- Engineering
  - Work in Progress, door access done, cargo drop off point added. Materials supplied, engineering 'elevator' functional. Blast doors need to be added. Detail work needs to be added. No major changes to be done.

- Civilian
  - Work in Progress, door access should be finalized for areas such as the bar, kitchen, hydroponics coffee shop. Chapel driver now operational. Several areas with cameras, several areas still lacking cameras. Detail work missing such as newscasters and fire alarms. No major changes to be done.

- Misc
  - Work in Progress,
    - Tech storage access completed. Security checkpoint door control and access done.
    - Airlock next to the research fixed. Waste disposals tweaked and fixed.
    - Work completed on EVA, finalized. No further changes.
    - IAA access and landmarks completed.
    - Holopads added to areas previously without such as in front of escape pods.

- Other Tweaks
  - Light ranges increased for both small and large lights.
  - Small lights have had their color changed to a much fainter tint
  - Comfy Chair tweak pending.
2015-08-01 00:02:29 -07:00
HarpyEagle 924d8fac74 Adds nightvision to cult constructs 2015-07-31 16:33:07 -04:00
mwerezak b0434d90b2 Adds stealth rig sprites
Adds sprites for the stealth rig, so that people don't mix it up with
the ninja. Helmet is different (based on swat mask and NVGs), everything
else is a copy of the ninja suit.
2015-07-31 14:41:32 -04:00
mwerezak 1bfa4da870 Fixes #10315
The cybersuit is no longer space-proof. In exchange, it has a few more
modules, built-in insulated gloves, and grippy shoes.
2015-07-31 14:41:31 -04:00
PsiOmegaDelta 7e6cb6f38c Compilation/definition fixes. 2015-07-31 10:05:42 +02:00
PsiOmegaDelta c28b3721b4 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/_helpers/unsorted.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
2015-07-31 10:00:16 +02:00
mwerezak 47d30a49a0 Fixes #10389
Allows glasses to set the see_invisible of their wearer.
2015-07-31 01:33:43 -04:00
Mloc 8578c08236 fixes #10374
Signed-off-by: Mloc <colmohici@gmail.com>
2015-07-30 22:46:54 +01:00
Mloc ac5774c81c some dview tweaks & fixes
Signed-off-by: Mloc <colmohici@gmail.com>
2015-07-30 19:50:32 +01:00
Zuhayr ad63247749 Merge pull request #10382 from Mloc/freezyfixes
fixes
2015-07-31 03:55:34 +09:30
Mloc 8cf9e32c2e Merge pull request #10361 from atlantiscze/tiny-little-logspammers
Fixes #10356
2015-07-30 19:24:24 +01:00
Mloc 6ef93d6613 Merge pull request #10370 from mwerezak/wounds
Fixes wound max_bleeding_stage oddness
2015-07-30 19:24:13 +01:00
Mloc ce11a6b516 Merge pull request #10379 from Karolis2011/dev-freeze
Fix for invisible tagger pipes
2015-07-30 19:23:33 +01:00
HarpyEagle c29dd9063c More tweaks to cut wound stages.
Enforced "blood soaked" clots where the clot stage was also a bleeding
stage, adjusted the thresholds for gaping_big and massive wounds to be
more even.
2015-07-30 11:46:49 -04:00
Karolis2011 a38ac6c8b7 Fix for invisible tagger pipes 2015-07-30 12:37:10 +03:00
PsiOmegaDelta 93e914f021 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/setup.dm
2015-07-30 10:49:37 +02:00
PsiOmegaDelta 841f7f6db2 Compilation fixes. 2015-07-30 10:41:01 +02:00
PsiOmegaDelta b6bd51828a Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/robot/robot_upgrades.dm
	code/modules/admin/admin_verbs.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_containers/syringes.dm
2015-07-30 10:38:44 +02:00
mwerezak 10df6b9403 Fixes #10363 2015-07-30 00:57:31 -04:00
HarpyEagle 171991faf8 Attempts to prevent future max_bleeding_stage confusion
max_bleeding_stage no longer switches itself around in New().
Instead, the value given refers directly to the index of the maximum
bleeding stage.

Should also make wound datums more friendly to initial(), if that's ever
needed.
2015-07-29 16:53:31 -04:00
HarpyEagle 3d10955ccb Adds missing clot stages to gaping_big and massive cuts.
Without the clot stages the jump between the next two stages was
abnormally large, and the values given for max_bleeding_stage did not make
much sense.
2015-07-29 16:46:50 -04:00
HarpyEagle d384150a48 Fixes wound max_bleeding_stage oddness
The max_bleeding_stage given to /datum/wound/cut/flesh led to
"Doctor places a bandaid on Patient's flesh wound." Also fixed the
bleeding stage for stumps, so that "bloody stump" counts as a bleeding
stage.
2015-07-29 16:40:09 -04:00