Commit Graph

8480 Commits

Author SHA1 Message Date
mwerezak
efbe5dcf67 Merge remote-tracking branch 'upstream/master' into escape-pod 2014-09-21 15:33:28 -04:00
Chinsky
7f8555afd1 Merge pull request #6478 from atlantiscze/world-remove
world << removal
2014-09-21 23:19:59 +04:00
Atlantiscze
19864ff3fe world << removal
- Removes world << which was triggered by robotic reset modules.
2014-09-21 04:09:01 +02:00
mwerezak
dd1b4b00d6 Fixes map area issues
Replaces missing station escape pod area, removes random security office
area in maintenance and replaces it with maintenance area, and splits
research dock off onto it's own area.
2014-09-20 20:19:56 -04:00
Chinsky
c529e014a7 Merge pull request #6462 from PsiOmegaDelta/Ion
AI restoration console shows ion laws
2014-09-20 21:20:33 +04:00
Chinsky
77d45e8b4c Merge pull request #6461 from atlantiscze/freezer-board-fix
Freezer Heater Board Fix + Runtime Hotfix
2014-09-20 21:20:28 +04:00
PsiOmega
03a293d226 AI restoration console shows ion laws
AI restoration console now displays ion laws just as the intelliCard does.
Fixes a minor problem with the intelliCard not adding newlines after ion laws.
2014-09-20 10:42:41 +02:00
Chinsky
9e2dcc4e4a Merge pull request #6455 from Zuhayr/master
Calamity and hydro tweaks
2014-09-20 00:07:56 +04:00
Atlantiscze
e479e4371c Runtime Hotfix
- Fixes RE's when building certain machines.
- Fixes #6441
2014-09-19 17:26:19 +02:00
Atlantiscze
e7297c90db Cyborg Radio Change
- Cyborgs can now toggle if they want their radio to broadcast to everyone around them. Starts ON by default.
2014-09-18 19:34:38 +02:00
Zuhayr
39689f05c7 Removed borer from roundstart calamity, added it to the dynamic event handler. Increased event frequency. 2014-09-18 21:41:54 +09:30
PsiOmega
fe126626ac Cleans up radio frequency numbers.
Replaces magic numbers across the code base with proper constants.
Prepares for the ability to have more than one antag channel in the future.
Corrects a lie.
2014-09-18 13:07:34 +02:00
Chinsky
8a9bcf656d Merge pull request #6425 from PsiOmegaDelta/Mech-Mech
Shuttle mech sensors now slaved to airlock docking controllers
2014-09-18 13:37:10 +04:00
PsiOmega
cdae6254a9 Fixes #6440
Changes cult conversation to use \him instead of him.
2014-09-18 07:45:44 +02:00
Chinsky
78a168ed55 Merge pull request #6416 from Hubblenaut/master
Fixes and Improvements Patch
2014-09-18 09:00:38 +04:00
Zuhayr
5c2e039e15 Borer fixes and tweaks. 2014-09-18 14:00:43 +09:30
Atlantiscze
c4338f96f8 Better usage of bitflags 2014-09-18 03:57:00 +02:00
Atlantiscze
5900736d7e Incorporated Suggestions
- Recharge stations now have charge overlay which shows approximate amount of remaining charge
- Recharge stations now don't use use_power() directly, performance increase
- Recharge stations now work even without external power, however their electronics will draw 50W from internal cell, eventually depleting it and shutting down completely.
2014-09-17 23:14:33 +02:00
Hubblenaut
a10b7284e5 Fixes nuke-op radios not having freerange set 2014-09-17 16:02:32 +02:00
Hubblenaut
33484a9f90 Fixes syndicates spawning with locker instead of uplink 2014-09-17 15:33:07 +02:00
Hubblenaut
1b1505153e Fixes Nuke-ops spawning with unwanted items 2014-09-17 14:15:26 +02:00
Atlantiscze
5b905ebde1 Cyborg Advanced Charging
- This solves various issues with cyborg charging
- Cyborg chargers have 15k charge capacity themselves. They charge at 2.5kW when no cyborg is inside and 25kW when cyborg is inside.
- Instead of draining power directly to cyborg's cell, they simply transfer power (capped at 250 charge/tick) from charger to cyborg.
- All is checked, which means no excess power is wasted. This means AFK cyborgs parked in rechargers are no longer power sinks

Balance
- Increased cyborg actuator power usage a bit.
2014-09-17 08:59:19 +02:00
PsiOmega
327e81958b Shuttle mech sensors can now be slaved to airlock docking controllers. 2014-09-17 07:46:39 +02:00
Atlantiscze
ded8e21c0f Cyborg Power Usage Overhaul
- Adds new standardised proc for power usage as Cyborg
- Each component now uses different amount of power. Some components use "idle" power (camera), which means constant load. Other components use "active" power, which is single-time burst load.. Example: Actuator.
- Power usage is directly proportional to work done. Moving cyborg uses more power than still cyborg.
- Information in Status tab changed. Now it only shows percentage of remaining charge, as well as cell rating and cell load (W)
2014-09-17 07:31:20 +02:00
Zuhayr
6621dde3e3 Merge pull request #6418 from meowy/panelpanel
Fixed configuration panel of a few bots reading "panel panel"
2014-09-17 12:37:42 +09:30
Ccomp5950
8030c9d771 Merge pull request #6408 from mwerezak/mech-sensor
Fixes mech sensors preventing shuttle undocking
2014-09-16 21:48:31 -05:00
Ccomp5950
0ede895e5c Merge pull request #6400 from PsiOmegaDelta/ColdEngine
Map changes
2014-09-16 21:45:46 -05:00
Ccomp5950
faddd0ecea Merge pull request #6413 from Zuhayr/master
Several tweaks/fixes for newhydro.
2014-09-16 21:44:09 -05:00
Zuhayr
24804b314a Should fix clam mode. Wish I could test it here. 2014-09-17 11:37:09 +09:30
Melvin Kicchi
f28c5198c6 Configuration window of floor/med/secbots doesn't read 'panel panel' anymore 2014-09-17 01:28:29 +02:00
PsiOmega
c9dc6c8add Merge remote-tracking branch 'upstream/master' into ColdEngine 2014-09-16 17:23:30 +02:00
Snapshot
56ffecce8c Merge pull request #6398 from PsiOmegaDelta/FiredoorLayer
Changes emergency shutter layer
2014-09-16 08:22:02 -07:00
Snapshot
20b133d683 Merge pull request #6396 from PsiOmegaDelta/SpaceHeaters
Fixes #6390
2014-09-16 08:20:42 -07:00
PsiOmega
63d81cad33 Fixes #6390. Don't know why Kelvin is used but at least it's no longer represented using degC. 2014-09-16 08:05:15 +02:00
mwerezak
2de7df27e0 Fixes mech sensors preventing shuttle undocking
Airlock controllers now use a signal_mech_sensor() proc to send commands
to mech sensors. Docking controllers don't appear to store the mech
sensor tag anywhere so the mech sensor code was left commented out.
2014-09-15 23:56:13 -04:00
Zuhayr
1ec1f2c6d3 Merge pull request #6366 from atlantiscze/cameras-fix-fix
Camera Fix
2014-09-16 01:38:10 +09:30
PsiOmega
56ee7e00b0 Map changes
Makes APCs with different cells specific types.
Replaces arrival's APC with a higher-capacity cell variant to avoid people being unable to leave due to power failure at 12:15.
The engine core now begins without oxygen but still requires cooling and everything else.
2014-09-15 15:30:27 +02:00
Snapshot
12495cbe59 Merge pull request #6378 from PsiOmegaDelta/NinjaSpawn
Sanity checks ninja spawns
2014-09-15 01:01:20 -07:00
PsiOmega
2e8e532082 Decreases the difference to avoid odd layering with tables. 2014-09-15 08:24:45 +02:00
Snapshot
db36243410 Merge pull request #6380 from Zuhayr/master
Calamity fix.
2014-09-14 22:03:06 -07:00
Zuhayr
1da290d14d Fix for cyborgs becoming lings in calamity mode. 2014-09-15 14:22:33 +09:30
Asanadas
6a973f5b4d Merge pull request #6376 from DJSnapshot/hotfix
bunch o' stuff (Faxes and custom borg fixes)
2014-09-14 21:08:11 -04:00
PsiOmega
ae1a3f3860 Sanity checks ninja spawns
Reduces the risk of ninjas spawning in the middle of space, having no idea which direction the station is.
2014-09-14 21:25:42 +02:00
Chinsky
200a1c0d01 Merge pull request #6328 from atlantiscze/malf-explode-fix
Malfunction Explode Fix
2014-09-14 21:48:57 +04:00
Chinsky
e8f87ceeba Merge pull request #6346 from PsiOmegaDelta/OutpostAirlock
Additional airlock vents in outpost airlocks
2014-09-14 21:47:54 +04:00
Zuhayr
fbfdfcc3a5 Should fix repeated antag selection for antag counts below max in calamity mode. 2014-09-15 01:10:25 +09:30
DJSnapshot
e6b5681db0 Rest of the fixes for custom borgs on module reset. 2014-09-14 06:22:46 -07:00
PsiOmega
73bf76db98 No longer presents Kelvin as degrees. 2014-09-14 11:38:03 +02:00
PsiOmega
bb1ef08ab3 Merge remote-tracking branch 'upstream/master' into OutpostAirlock 2014-09-14 08:28:57 +02:00
Atlantiscze
962048f65f iFail typo fix 2014-09-14 06:31:34 +02:00