Commit Graph

326 Commits

Author SHA1 Message Date
Kelenius e6dc9d36fd Update for machine upgrades and some science
Also adds RPED and makes biogenerator and borg charger constructible .
2015-02-08 15:39:11 +03:00
Zulker Nayeen Nahiyan 0a3f523066 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
Conflicts:
	code/__HELPERS/maths.dm
	code/__HELPERS/type2type.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/clothing/spacesuits/captain.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm
	code/modules/clothing/spacesuits/rig/suits/light.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/utility.dm
	code/modules/events/event_manager.dm
	code/modules/mob/living/living.dm
	code/setup.dm
2015-02-04 04:44:09 +06:00
Chinsky c3559556a0 Merge pull request #8027 from Baystation12/dev-freeze
Wiz freeze
2015-02-03 18:23:18 +03:00
Chinsky aa7fde250c Merge pull request #7801 from Mloc/bs12-glowypipes
refactor buckling + glowy HE pipes
2015-02-03 18:12:09 +03:00
PsiOmegaDelta cda262bbe4 Merge pull request #7863 from Kelenius/ofAlarmsAndScrubbers
Adds oxygen and nitrogen to air alarm scrubber list
2015-02-03 16:11:49 +01:00
mwerezak c15efc73ba Updates comments 2015-01-27 22:14:26 -05:00
mwerezak 73b6150d55 Fixes radiator exposed surface value
Fixed the RADIATOR_EXPOSED_SURFACE_AREA_RATIO constant. The existing
value of 3 cm was bad the value needs to be unitless. Also replaced the
RADIATOR_OPTIMUM_PRESSURE placeholder with something that has a bit more
substance.
2015-01-26 11:45:53 -05:00
PsiOmega 9a65b478c9 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
2015-01-21 08:53:27 +01:00
Mloc b1ba9a6d0e Merge pull request #7813 from SkyMarshal/patch-1
Adjusts HE pipe properties
2015-01-20 11:24:03 +00:00
Kelenius 37962065ae Adds oxygen and nitrogen to air alarm scrubber list 2015-01-16 23:02:55 +03:00
SkyMarshal 12d056106e Adjusts informative comments. 2015-01-15 17:57:52 -07:00
SkyMarshal 5104e40be3 Adding calculated temperature for HE pipes. 2015-01-13 15:41:45 -07:00
SkyMarshal 82b5bd0f52 Sign errors are almost as bad as off-by-one. 2015-01-13 15:32:03 -07:00
SkyMarshal 1ab66130ff Changed heat exchange pipe properties.
No more suns above and below station shining on every square centimeter of it.
2015-01-13 15:28:42 -07:00
Mloc-Argent 70f67409d5 HE pipe changes
HE pipes will now change colour as they heat up, the procs for
 calculating this are in type2type.dm.
Mobs buckled to HE pipes will be forced to lie down and will share
 heat with and get burned by the pipe network.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2015-01-12 21:28:41 +00:00
Mloc-Argent 537b78fc80 refactor buckling to be more generic
Buckling procs and vars have been moved down to /obj.
Behaviour is mostly the same, but you can buckle cuffed people to
 pipes and they will automatically unbuckle if the cuffs are removed.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2015-01-12 21:28:31 +00:00
Zulker Nayeen Nahiyan b6ab0b64c0 Cleanup global.dm and setup.dm, fix typos in the other files
`code/setup.dm`:
	Fixed large amounts of indenting.
	Fixed large numbers of comments and their clarity.
	Added parentheses to macros using expressions.
	Added FIXME for unused duplicated macros, without certainty of their requirement.
	Removed some duplicate macros present. (`BRUTE`, `BURN`, etc.)
	Removed macro `PI`, and replaced instances of its use with `var/const/Pi` from `maths.dm`

`code/global.dm`:
	Fixed large amounts of indenting, added newlines to long single-lined list definitions.
	Slightly clarified comments.
2015-01-10 02:01:55 +06:00
ccomp5950 27765f799f Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
Conflict resolution.

Conflicts:
	code/ATMOSPHERICS/components/unary/vent_pump.dm
2015-01-06 12:36:28 -05:00
mwerezak f9344a5a2d Atmos machine update
Takes a pass at updating ATMOSPHERICS to take advantage of the new powernet changes.

Also removes var/on definitions from many atmos machines. Machines generally shouldn't
be doing "on" things if they aren't using power, and most players don't expect a machine
to use power if it isn't "on," so I guess this is fair game.

Also, further refactoring.
2015-01-02 01:46:18 -05:00
ccomp5950 a41b5bea52 Unary Vent Pump Optimizations.
We have like 250 of these on the map, each one calculates the atmospheric properties of the air around it each tick.
99% of the time this isn't even needed.  So...if it's not needed this tick we hibernate for 5 to 10 ticks before checking again.
2015-01-01 17:20:51 -05:00
Zuhayr 971336d223 Prevents power drain from functioning on piping (#7567) 2014-12-30 15:57:03 +10:30
mwerezak d4a193808b Replaces awful connect type system with bitflags 2014-12-23 18:59:54 -05:00
Ccomp5950 cb0eca68ac Merge pull request #7297 from Amunak/pipez
Engine remap, valves now show open/close state on examine.
2014-12-08 20:47:09 -05:00
Mloc efe78df3ff Merge pull request #7299 from Loganbacca/freezefix
Fixes omni-filters not working
2014-12-08 13:17:36 +00:00
Loganbacca 92c81aa958 Fixes omni-filters not working 2014-12-09 01:15:10 +13:00
Amunak fb35debec9 Valves will now tell you if they are open or closed when you examine them. 2014-12-08 12:38:42 +01:00
Mloc 83f2a5ba5a fix some misplaced set_dir()s
fixes part of #7284
fixes #7288
fixes one of #7287

Signed-off-by: Mloc <colmohici@gmail.com>
2014-12-08 10:09:09 +00:00
Mloc-Argent 117ca6a135 refactor 'dir = ' into 'set_dir()'
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-01 13:44:02 +00:00
PsiOmega c45f77f247 Merge remote-tracking branch 'upstream/dev' into APC 2014-11-19 14:40:18 +01:00
Zuhayr 660b32629e Merge resolution. 2014-11-19 23:19:33 +10:30
RavingManiac 594ac35ce1 Fix for dual-vent-pumps being broken. 2014-11-17 21:33:02 +08:00
PsiOmega ffbbf2b858 Merge remote-tracking branch 'upstream/dev' into APC
Conflicts:
	code/ATMOSPHERICS/components/unary/heat_source.dm
2014-11-16 10:38:01 +01:00
PsiOmega 7ff2e4547b Scrubber Icons
Gives online scrubbers a slightly more appropriate icon while viewed in the map.
2014-11-14 18:48:56 +01:00
Zuhayr 90d65aed57 Removed attack_paw, attack_animal and attack_slime. 2014-11-13 17:15:29 +10:30
PsiOmega 0468f12e91 Merge remote-tracking branch 'upstream/dev' into APC
Conflicts:
	code/game/gamemodes/events/power_failure.dm
	code/modules/power/smes.dm
2014-11-11 14:13:02 +01:00
Zuhayr b4ea25d064 Merge conflict resolution. 2014-11-10 13:00:06 +10:30
Chinsky 4884fe2ba8 Merge pull request #6947 from mwerezak/pipe-cap
Fixes #6299, Again
2014-11-07 03:45:56 +03:00
PsiOmega bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
mwerezak fc6f3ea685 Fixes #6299 2014-11-05 00:03:39 -05:00
Ccomp5950 789906cae2 Merge pull request #6926 from mwerezak/pipe-layer
Fixes #6355
2014-11-04 02:17:41 -05:00
mwerezak 5dcda61181 Fixes #6355
Not sure why it was commented it out, but it seems to be the cause of
the layer issues.
2014-11-02 20:33:41 -05:00
Ccomp5950 0f174fe1ac Merge pull request #6911 from mwerezak/he-pipes
Fixes #6910
2014-11-01 19:53:45 -04:00
mwerezak 17316f912e Fixes #6910 2014-10-31 22:22:52 -04:00
mwerezak f3d423f3d0 Fixes #6746 2014-10-30 00:27:39 -04:00
PsiOmega a1c19b78be Ports more of /tg/'s powernet code.
Among other things this fixes a a bug where SMES would draw excess power from the powergrid they were outputting to, rather than drawing from.
2014-10-29 14:01:35 +01:00
mwerezak 66f2280159 Gas heaters heat faster
Restores a symmetry between heaters and freezers. Also they were nerfed quite a bit when their power use was lowered to 20kW, this undoes the nerf.
2014-10-26 15:16:28 -04:00
Zuhayr d7e2c0fac9 Merge branch 'xenorewrite' of https://github.com/Zuhayr/Baystation12 into xenorewrite 2014-10-01 06:06:10 +09:30
Zuhayr b411da44b8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-09-30 23:23:05 +09:30
Zuhayr 223bd86f18 Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev
First pass on major conversion of xenomorphs to a human subspecies. Additional condensing of various redundant mob verbs.
Converted larva and diona to their own class, collapsed the rest of xenomorphs into a human species, other stuff.
Completely removed attack_alien(). Still have to reimplement some of the lost behavior for human/alien.
Reapplies lost attack_alien() functionality other than tackling/caressing.
Further alien/humanoid cleanup and xenospawn fix-ups. Also uncommented caste verbs.
Removed half-finished abilities system since species.dm handles it.
All xenomorphs functionality should be working now, other than the HUD, tackling and the xenomorph balance issues.
Added icons for xenomorph castes, moved broadcast languages into datums, removed alien_talk and robot_talk vars.
Merged with organ removal code.
Reapplied verbs to simple_animals/slimes. Updated species definitions to have appropriate organs.
Readded tackle as a human verb.
Borer changes regarding brain removal.
Working on moving the human HUD to the species datum a bit. Mixed results.
Moved Cortical Link to a language, added borer husks.
Tidied up the HUD stuff. Still need to make it rebuild properly when species is changed, but this will do for no
Compile fix, forgot the DME.
Fixed up ventcrawl, added new organ mechanics for dionaea.
Fixed up some overlooked sections causing mobs without brains to die immediately.
Fixed up plasma generation for queens, bugs with organs, force_organ issues with set_species().
2014-09-29 06:19:26 +09:30
mwerezak 5dae1fb667 Fixes pressure regulator flow rate reporting
Fixes the pressure regulator's reported flow rate not being set to 0
when no gas could be transferred.
2014-09-27 19:41:53 -04:00