Commit Graph

1924 Commits

Author SHA1 Message Date
mwerezak 5eaebce87e Merge remote-tracking branch 'upstream/dev' into power-net 2014-07-27 20:25:57 -04:00
mwerezak 5f9f6e2054 Merge remote-tracking branch 'upstream/dev' into power-net 2014-07-26 13:56:52 -04:00
Zuhayr 4ef8a08310 Added portable_atmospherics to hydroponics machine path, couple of other tweaks. 2014-07-27 03:20:16 +09:30
Zuhayr efe1c2feb2 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-26 15:39:25 +09:30
DJSnapshot a4fc2b04a2 fix to allow non-humans to be stunned like they should be. Gosh. (Also, clumsy check and making harmbaton actually work) 2014-07-25 16:56:56 -07:00
mwerezak 79d4c444c2 Merge remote-tracking branch 'upstream/dev' into power-net
Conflicts:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/game/machinery/alarm.dm
	code/game/machinery/spaceheater.dm
2014-07-24 16:04:41 -04: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
mwerezak 09280953b2 Merge remote-tracking branch 'upstream/dev' into power-net
Conflicts:
	code/game/machinery/recharger.dm
2014-07-21 19:40:23 -04:00
Zuhayr 60d9d3d5e6 Merge resolution. 2014-07-21 16:34:38 +09:30
Zuhayr ff38aca774 Merge resolution. 2014-07-21 16:17:15 +09:30
Zuhayr 6b51645283 Merge pull request #5704 from mwerezak/species-refit
Fixes object icons not being updated when refitting hardsuits for different species
2014-07-21 16:09:47 +09:30
mwerezak e9772faabc Fixes skrell helmet refitting, modkit text 2014-07-20 11:34:46 -04:00
mwerezak 789d3e4d54 Fixes modkits
Fixes modkits not tracking suit/helmet parts, not checking allowed
parts, and not checking if the clothing needs to be modified.
2014-07-19 23:17:35 -04:00
mwerezak e8c4ad07bb Adds a system for refitting species clothing 2014-07-19 22:08:31 -04:00
Whitellama 342a187c8b Eating with utensils now produces the eating sound, fixed #5687 2014-07-19 18:33:30 -07:00
mwerezak c46904a3b6 Merge remote-tracking branch 'upstream/dev' into power-net
Conflicts:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/ATMOSPHERICS/pipes.dm
2014-07-18 15:02:07 -04: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
Mloc-Hibernia 51d2451c01 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	nano/templates/geoscanner.tmpl
2014-07-18 13:15:30 +00:00
Mloc-Hibernia 281a26b979 Merge remote-tracking branch 'upstream/master' into dev-freeze
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
2014-07-18 13:08:12 +00:00
Zuhayr 1345ee5a5c Initial commit for mobile pAIs. Almost guaranteed to be broken as shit. 2014-07-17 23:09:47 +09:30
Zuhayr 3976433396 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-17 20:57:06 +09:30
mwerezak 5ca36fcadb Merge branch 'dev' into power-net
Conflicts:
	code/game/machinery/Freezer.dm
	code/ATMOSPHERICS/components/unary/heat_source.dm
	code/modules/organs/organ_external.dm

Also updated:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	nano/templates/gas_pump.tmpl
2014-07-16 16:14:52 -04:00
Walter0o 6c62e9e56b should fix #5618, trivial kitchen utensil bug 2014-07-16 20:28:19 +02:00
Zuhayr f4ff51f146 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-16 19:32:00 +09:30
Zuhayr f795712a95 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2014-07-16 19:30:41 +09:30
Atlantiscze db18074f90 Designed to replace AI's intercoms. Integrated headset-like device which has access to all department frequencies. Also let's AIs use radio on intellicard.
AI's communication can however be disabled by using intellicard option. Communication will be disabled until it is restored via intellicard again,
even if the AI is moved back into physical core. ICly it's software lock which prevents the AI from using communication circuits which are standard in all
AI cores/intellicards/etc. This does not stop AI from using intercom, however.

 Forum link: http://baystation12.net/forums/viewtopic.php?f=5&t=6536&start=1260
2014-07-16 00:54:54 +02:00
mwerezak f2845dbe76 Thrown items can be targeted, has miss chance...
...based on distance, similar to projectiles.
2014-07-15 01:14:04 -04:00
Zuhayr d050f0a30b Merge pull request #5620 from Decius-R/loyalty_implants
Loyalty Implants
2014-07-15 10:30:48 +09:30
Decius-R 8d8e3f43d4 Fixed a small mistake..
Forgot to remove where I was going to originally make a proc. Didn't see it at skim through. Fixed.
2014-07-14 19:14:38 -04:00
Decius 0b314561ca Now allows admin override via player panel, a small fix, and...
implantation works again. Since they'll only be accessible via an admin
specifically spawning it, except for in cases where it is configured
to be allowed, it'll be fine.

This now allows admins to incorporate loyalty implants still if they so
wish for whatever reason, but it is normally inaccessible.

Signed-off-by: Decius <deciusreln97@gmail.com>
2014-07-14 19:02:21 -04:00
Mloc 48cea3dbb3 Merge pull request #5578 from Faerdan/dev
NanoUI Update
2014-07-14 23:35:49 +01:00
Decius b37ce454df Removed from map + made implanters conform to configuration...
Signed-off-by: Decius <deciusreln97@gmail.com>
2014-07-14 18:02:04 -04:00
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
Loganbacca 6b64fb5e77 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-14 19:12:22 +12:00
Chinsky d59e5b8da2 Merge pull request #5603 from DJSnapshot/hotfix
Changing URL of Corporate Regulations to the new Corporate Regulations
2014-07-14 07:12:37 +04:00
Zuhayr 5f8723352d Merging robot_modules.dm and master controller setup. 2014-07-14 09:10:02 +09:30
DJSnapshot 743ac61155 Little Slip-up 2014-07-13 13:30:36 -07:00
DJSnapshot 5063178aa6 Changed URL to Corporate Regulations 2014-07-13 13:29:19 -07:00
Kelenius aad89409de Slime update 2014-07-13 17:37:30 +04:00
Chinsky 4e371f7af7 Merge pull request #5585 from SparklySheep/patch-3
Fuk da law
2014-07-13 08:56:54 +04:00
mwerezak c0487b9c90 Fixes human internal organs list 2014-07-12 16:15:37 -04:00
SparklySheep 55c7fbe739 Changes Space Law book to Corporate Regulations
Because fuck anyone that thinks "Space Law" is a good name for a roleplaying server.
2014-07-12 10:26:54 -05:00
Mark Aherne 6c12d62285 Merge branch 'dev' of https://github.com/Faerdan/Baystation12 into dev 2014-07-11 10:53:08 +01:00
Mark Aherne 7e7e6cd8ac Continued work in progress on a major revision of the NanoUI templating system. 2014-07-11 10:48:42 +01:00
Ccomp5950 e44bcf81fe Merge pull request #5559 from Walter0o/deadly_fork_fix
deadly sharp w_class 1 fix
2014-07-10 23:40:25 -05:00
Walter0o 5289776e33 removes sharpness from forks
too commonly available to enjoy the sharp bonus.
2014-07-10 19:47:59 +02:00
DJSnapshot eacd384d39 Merge pull request #5554 from Baystation12/master
Updating dev with master
2014-07-09 23:00:04 -07:00
Jim the Cactus c984385adb Merge branch 'master' of https://github.com/baystation12/baystation12 2014-07-09 14:53:16 -06:00
Zuhayr f477012ab8 Merge pull request #5533 from mwerezak/wound-infections
Fix for #5532 and the last of the infection changes, I hope
2014-07-09 19:28:00 +09:30
Mloc c7b2aefdc7 Merge pull request #5534 from Hubblenaut/master
Fixes painkillers leaving the body way too fast and adds minor feature to health analyzers
2014-07-09 10:41:22 +01:00