Commit Graph

20433 Commits

Author SHA1 Message Date
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
mwerezak
d25d0c700c Fixes #10403
can_start() no longer attempts to rebuild the antag candidate lists but
instead reads the existing lists that are now built in pre_setup()

Also fixes an inverted check that was preventing antags from spawning.
2015-08-03 20:01:55 -04: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
mwerezak
2e1607f611 Fixes #10414
Antagonists are again drafted in attempt_spawn() and all players in the pending list will be spawned (provided they pass sanity checks).
Instead, attempt_spawn() is called in either pre_setup() or post_setup() depending on if the ANTAG_OVERRIDE_JOB flag is set. And all antags have
their spawning finalized in post_setup().

In addition, if game mode setup fails, all pending antagonist players have their special roles cleared.
2015-08-03 12:03:08 -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
PsiOmegaDelta
998b72bcd8 Fixes #10372.
Removes snowflake attack code.
2015-08-03 09:20:36 +02:00
Neerti
8913f0c9df Merge pull request #80 from Woodratt/Woodrat_Work_v6
Woodrat Work v6 with Engineering Outpost DLC
2015-08-03 02:44:33 -04:00
Woodrat
9858ea7fef Woodrat Work v6 with Engineering Outpost DLC
- More Cameras added to Civilian Areas
- Cargo foyer area added.
- Cafeteria Floors Properly Painted
- Improper access restrictions removed from security checkpoint and medical door bolt locks
- Guide signs posted all around the central ring
- Engineering dome oupost DLC added for $19.99
- - (Minor bug with docking will fix later)
- Recreation area vented to space fixed, (holes under doors, removed extra wires and pipes)
- Captain's Bathroom now with 100% more lighting
- Extra pipes in Atmos removed, one tweak left to be done.
- Windows in the AI core fixed, Door button added, Power wire fixed. Hatch access fixed.
- Visitor beds upgraded.
- Captain's bed now improved for ERP
- ERT Chem dispenser fixed.
- Engineering soda dispenser fixed.
- Mixed air outlet valve fixed??
- Missing area tile for small admin shuttle fixed.
- Dorms now has R-walls
- Gateway Cryo added.
- Teleporter reworked and now operational and fixed.
2015-08-02 23:39:00 -07:00
Neerti
41ead053e1 Adds Redman's map. 2015-08-02 23:56:56 -04:00
Atlantis
ad45e5d16b Implements req_one_access for bots, as per request on GitHub discussion. 2015-08-02 23:23:18 +02:00
GinjaNinja32
e9ff87fbd6 Lattices, shuttle windows, and shuttle engines now rotate correctly with client.dir 2015-08-02 20:50:47 +01:00
GinjaNinja32
16bcc04c83 Windows now rotate correctly with client.dir 2015-08-02 18:06:02 +01:00
GinjaNinja32
e78715205c Walls now rotate correctly with client.dir 2015-08-02 18:05:27 +01:00
GinjaNinja32
d050606665 Changes tables to rotate correctly with client.dir 2015-08-02 15:03:42 +01:00
Neerti
576667e870 Increases security officer slots to four. 2015-08-02 03:22:07 -04: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
2f20f0c537 Fixes #10249
Moves the isrobot() check so that it only applies to robots interacting
with doors to open them.
2015-08-02 00:02:33 -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
8679887b17 Code relocation. 2015-08-01 19:46:35 +02: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
mwerezak
b5e503c2ff Merge pull request #10399 from GinjaNinja32/callproc
Change callproc to check validity earlier
2015-08-01 12:24:13 -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
GinjaNinja32
41a75e330a Holodeck fix 2015-08-01 09:39:29 +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
Zuhayr
82152daa30 Merge pull request #10393 from Baystation12/dev-freeze
Dev freeze
2015-07-31 18:59:03 +09:30
PsiOmegaDelta
75920431e8 Merge pull request #10386 from mwerezak/antag-fix
Fixes #10309
2015-07-31 10:26:14 +02:00
PsiOmegaDelta
7e6cb6f38c Compilation/definition fixes. 2015-07-31 10:05:42 +02:00
PsiOmegaDelta
353f685339 Moves code to relevant define. 2015-07-31 10:00:34 +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
PsiOmegaDelta
3c9dc10746 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/gamemodes/cult/runes.dm
2015-07-31 09:48:15 +02:00
mwerezak
47d30a49a0 Fixes #10389
Allows glasses to set the see_invisible of their wearer.
2015-07-31 01:33:43 -04:00
HarpyEagle
7feaf13d81 Fixes #10309
Antag types with ANTAG_OVERRIDE_JOB are finalized before jobs are handed out, based on the idea that something which replaces a player's job should not need to depend on their assigned job in any way.
Moves the selection of pending antags outside of can_start().
Fixes issue with antag distribution that occurs when a player is a candidate for multiple antagonist types.
2015-07-30 22:28:17 -04:00
Mloc
8578c08236 fixes #10374
Signed-off-by: Mloc <colmohici@gmail.com>
2015-07-30 22:46:54 +01:00
Mloc
b727de8398 anchored and unsimulated objects are no longer considered for airflow
Signed-off-by: Mloc <colmohici@gmail.com>
2015-07-30 21:00:42 +01:00
Mloc
cfac670cb6 anchored and unsimulated objects are no longer considered for airflow
Signed-off-by: Mloc <colmohici@gmail.com>
2015-07-30 19:51:11 +01:00