Commit Graph

1442 Commits

Author SHA1 Message Date
Zuhayr
f09d1218fe Master to dev merge. 2014-08-11 17:23:40 +09:30
Whitellama
49c8c6f2cb Made arcane tomes a subtype of books, fixes #5838 2014-08-10 02:23:36 -07:00
Walter0o
f21ac59588 fixes runtime with calling PP on dna-less mobs 2014-08-01 21:59:48 +02:00
Zuhayr
f2393d9465 Replaces antag intro text and objective announcement with a proc. 2014-07-30 21:36:31 +09:30
Zuhayr
3105297f3e Adjusted spawn procs for heist and nuke. 2014-07-30 21:08:28 +09:30
Mloc-Hibernia
a2dc7b827b Merge remote-tracking branch 'upstream/pr/5689' into dev
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/crew.dm
2014-07-26 14:25:24 +00:00
Zuhayr
5da36d265e Merge resolution with PDA nanoui. 2014-07-25 22:57:53 +09:30
Mark Aherne
d0e01f70cc Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-07-23 21:58:13 +01:00
Mloc-Argent
deb923ec70 added debugging verb support for gas_data
Updates mod_list() with associative editing support.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-07-22 22:54:12 +01: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
Mark Aherne
f431b969af Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-07-21 22:33:30 +01:00
Mark Aherne
32a1220559 NanoUI updates.
* Map gen verb is now limited to those with server access.
* Added Z layer support.
2014-07-21 22:32:45 +01:00
Zuhayr
d02e370830 Integrated crossbows/pneumatic cannons into launcher gun type, added back sprites. 2014-07-21 19:02:38 +09:30
Zuhayr
60d9d3d5e6 Merge resolution. 2014-07-21 16:34:38 +09:30
Mloc-Hibernia
ccc73ddf69 modularize ban system
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
2014-07-18 21:08:01 +00:00
Loganbacca
e05b5c0bfb Pipe rendering rewrite
- Complete rewrite of pipe rendering code. It now selects icons from a shared cache.
- Manifolds and other devices (pumps, filters, etc.) now match the color of the connected pipes.
- Updated omni devices to use the shared cache.
- Set separate pipe color definitions.
- Cleaned up a lot of pipe code, converting it to absolute paths and removing old commented out code.
- Tweaked t-ray rendering code.
- Tweaked pipe painter.
- Enhanced pipe checking debug command.
- Expanded tank capacity and resprited them.
2014-07-18 13:39:39 +00:00
Zuhayr
f795712a95 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2014-07-16 19:30:41 +09:30
Decius
203c36114d Made spawning with a loyalty implant compliant to configuration...
Created a proc for being implanted with loyalty implant which
checks for the configuration for whether or not it will work. If it is
enabled, it continues on-- if it is disabled, it returns from the proc.

Also made secure closets not automatically spawn them unless the config
is set to allow it.

Admin 'loyalty implanting' via the panel is now compliant to the
configuration file. If preferred, I am willing to make an override variable
to the proc that will allow admins to do it anyway.

Supply pack for it commented out due to inability to make it conform.
Easy enough to re-add back for anyone downstream if they wish it. Same
applies to the design.


Signed-off-by: Decius <deciusreln97@gmail.com>
2014-07-14 17:21:11 -04:00
Kelenius
aad89409de Slime update 2014-07-13 17:37:30 +04:00
Zuhayr
5ace6d3bc0 Mining rework. Added ore scanner, adjusted values for spawn, added debug verbs. 2014-07-09 19:12:32 +09:30
Ccomp5950
36cf4bd41e Mentors will no longer see highlighed names in ahelps / msay for players with special roles (Antags, etc.). 2014-07-07 21:37:28 -05:00
Chinsky
8d81675509 Merge pull request #5420 from mwerezak/emergency-shuttle
Fixes #5418 - also a bunch of small shuttle fixes
2014-07-01 02:10:23 +04:00
mwerezak
9991b46ea6 long_jump() now uses an arrive_time var instead of sleeping the whole time.
Makes ETAs more accurate, allows the possibility of interrupting
long_jumps in the future.
2014-06-30 15:14:20 -04:00
Zuhayr
48f02db5a0 Fixed some icon issues with vox/adjusted paths, fixed icon issue with armalis cannon. 2014-06-29 10:00:35 +09:30
Chinsky
6bd0743aa3 Merge pull request #5367 from Zuhayr/voxwhitelist
Adds Vox as a station race, adds vox clothing icons from /vg/.
2014-06-27 19:36:31 +04:00
mwerezak
84023ff1a3 Updates secrets panel to use the new shuttle...
...datum correctly.
2014-06-26 14:48:49 -04:00
Zuhayr
2ee8f78f75 More icon changes, updates item paths, moves vox cortical stack spawn to raider proc, makes vox whitelisted and spawnable with internals. 2014-06-26 08:47:58 +09:30
mwerezak
25bcdfa39e Merge remote-tracking branch 'upstream/dev' into emergency-shuttle
Conflicts:
	code/setup.dm
2014-06-24 00:09:17 -04:00
mwerezak
9e0562b16c Adds shuttle controller
Moves all ferry shuttle processing into one place: the new shuttle
controller.

Also cleans up the emergency shuttle controller a bit more and fixes
multi-shuttle cooldown.
2014-06-23 22:00:57 -04:00
Zuhayr
a6f64ccd9c Merge pull request #5330 from mwerezak/emergency-shuttle
Updates emergency shuttle controller to use shuttle datums
2014-06-23 21:19:36 +09:30
mwerezak
71351bd285 Some fixes 2014-06-22 20:40:08 -04:00
mwerezak
dc304026a9 shuttle_controller now uses a shuttle datum 2014-06-22 18:10:56 -04:00
Mloc-Argent
dd7f0dac0e Merge remote-tracking branch 'upstream/master' into dev
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm
2014-06-20 22:02:40 +01:00
Boop
a903e400dd Fixes #5088
also fixes more runtimes that mloc gave me
2014-06-17 20:35:48 +01:00
Mloc-Argent
9896e44d8a Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/__HELPERS/unsorted.dm
2014-06-12 18:56:26 +01:00
Zuhayr
0722775bda Merge pull request #5207 from mwerezak/get_turf_loc-cleanup
Cleans up get_turf_loc()
2014-06-12 18:13:01 +09:30
Zuhayr
4ee8f56c29 Merged master to dev, manually fixed merge issues in map, may be some left. 2014-06-11 18:11:41 +09:30
Ccomp5950
0e0c692634 Removed debugverb 2014-06-11 00:51:20 -05:00
Ccomp5950
77c733b17c Mentor permissions fixes and such.
Created a helper proc /proc/is_mentor(client) use this when determining if someone is a mentor and they aren't the usr of the proc (rights_check uses usr)

Mentors will no longer hear ghosts while playing
Mentors will no longer see orange text around names in check_player_age panel if they have special_roles
Mentors will no longer be able to tell players with special roles through the use of player_panel
Mentors will no longer be able to aghost, use antagHUD, then return to their bodies.
2014-06-10 19:48:41 -05:00
mwerezak
a8816823a5 Replaces get_turf_loc() with get_turf()
The former does exactly the same thing as get_turf(), except it runtimes
if one of the atoms has a null loc.
2014-06-10 13:43:11 -04:00
mwerezak
b4bb8ab31d Reworks shuttles to be more extensible
Kudos to Zuhayr for laying the groundwork for this.
2014-06-09 23:41:29 -04:00
mwerezak
0319c96502 Adds docking support to shuttles, NanoUI 2014-06-09 23:41:08 -04:00
mwerezak
730623e6e4 Adds support for different shuttle states
Also cleans up shuttle move states a bit.
Moves shuttle_console to it's own file
2014-06-09 23:38:53 -04:00
Ccomp5950
f0a75407b8 Rights check instead of holder check? Sure why not.
Mentors can now see ahelps.
2014-06-03 15:28:14 -05:00
Zuhayr
54b08ff55a Moved the Vox skipjack console over to a multi-destination shuttle datum setup. 2014-06-03 23:21:10 +09:30
Zuhayr
c01b124ac7 Added a 'controller' for shuttles (really just a data container), fixed up the admin shuttle verbs into one general verb, changed shuttles to use controller instead of populating lists at spawn. 2014-06-03 18:06:05 +09:30
Zuhayr
405055eda8 Some cleanup stuff for prior commits. 2014-06-03 15:40:40 +09:30
Zuhayr
00c81bb675 Moved engineering, research and mining shuttles to a generalized system with its own directory structure. 2014-06-03 15:26:34 +09:30
Ccomp5950
1350115824 Mentor Unnerf.
JMP was doing a rights check in the Topic instead of doing it on the proc, just went ahead and fixed the rights check to include mentors.
Mentors now have player panel but can't see traitor panel.  The idea is so they can't tell who is an antag through this.
2014-06-02 07:09:00 -05:00
Zuhayr
1e135f91af Merge resolution with master. 2014-06-02 12:05:12 +09:30