PsiOmegaDelta
fae43793a4
Merge pull request #7142 from PsiOmegaDelta/Singularity
...
Syndicate beacon power consumption and objective.
2014-11-26 22:08:48 +01:00
Chinsky
5cc4d3490c
Merge pull request #7141 from Amunak/chat-shenanigans
...
OOC and LOOC colors now use stylesheet; also LOOC rewrite
2014-11-27 00:03:06 +03:00
Chinsky
ee815b719e
Merge pull request #7129 from PsiOmegaDelta/Wires
...
Wires
2014-11-27 00:02:39 +03:00
PsiOmegaDelta
d2a5689d61
Merge pull request #7131 from GinjaNinja32/nullspace
...
Fixes most nullspace items, rewrites floor tiles not to del() so much
2014-11-26 14:09:36 +01:00
PsiOmega
d6c0ebf138
Syndicate beacon power consumption and objective.
...
Cleans up syndicate beacon power consumption.
Objectives are now only given if not disabled.
Relative-proc cleanup.
2014-11-26 09:56:15 +01:00
Amunak
caf153ca61
Rewrite of LOOC code
...
LOOC now uses stylesheet.
It is less messy (there is now only one loop)
Added shortcut for admins to jump to mob
2014-11-26 04:17:19 +01:00
Amunak
5a65c85cb0
Moved OOC color definitions to stylesheet:
...
Removes the unused (and abused) set-player-OOC-colour verb.
Adds definitions for each rank to the stylesheet, moving it from the OOC file.
Updates the OOC-text-color verb accordingly.
Made the custom OOC text color resetable.
Cleaned up hardcoded values, old code and comments.
2014-11-26 04:04:32 +01:00
GinjaNinja32
a9111cc8e1
Fixes and guards against strange values
2014-11-25 20:01:30 +00:00
GinjaNinja32
c567bd93e9
Add defines, change comment
2014-11-25 19:44:36 +00:00
PsiOmega
31fc696026
Merge remote-tracking branch 'upstream/dev' into Wires
...
Conflicts:
code/game/machinery/autolathe.dm
2014-11-25 11:19:39 +01:00
GinjaNinja32
f8ea85b30e
Typo fix
2014-11-24 17:29:48 +00:00
GinjaNinja32
48343a23fb
Fix most nullspace items, rewrite floor tiles not to del() on every place/remove
2014-11-24 17:05:46 +00:00
PsiOmega
e98649fa5e
Plastique wiring.
2014-11-24 11:21:31 +01:00
PsiOmega
1e479536db
Radio wires.
2014-11-24 10:19:57 +01:00
PsiOmega
2d832b19cd
Mulebot wiring.
2014-11-24 09:50:19 +01:00
PsiOmega
2bfce70376
Autolathe wiring.
2014-11-24 09:17:22 +01:00
Zuhayr
2b93a89d51
Generalizing lathe recipes.
2014-11-24 17:31:15 +10:30
PsiOmega
dc5ab9bb64
Merge remote-tracking branch 'upstream/master' into dev
2014-11-23 12:07:45 +01:00
PsiOmegaDelta
8e50a32ba8
Merge pull request #7103 from Segrain/dev
...
Robotic appearances.
2014-11-23 12:05:51 +01:00
PsiOmegaDelta
6db8680406
Merge pull request #7097 from GinjaNinja32/sensors
...
Crew Monitoring Computer improvements, wallets working with computers
2014-11-22 22:36:40 +01:00
PsiOmegaDelta
51386b6b45
Merge pull request #7102 from PsiOmegaDelta/AssignmentERT
...
ERT and Xenobiology security HUD icons
2014-11-22 11:18:09 +01:00
PsiOmegaDelta
d9aae79a32
Merge pull request #7008 from Zuhayr/spaceninjas
...
Hardsuit/voidsuit change, ninja refactor.
2014-11-22 09:30:54 +01:00
Ccomp5950
da3ad0a6db
Merge pull request #7099 from Amunak/endgame-info
...
Added round end summary (attempt 2)
2014-11-22 03:28:38 -05:00
Ccomp5950
d0383883c2
Merge pull request #7094 from Neerti/borg_hud_port_2
...
Semi-ports /tg/'s cyborg HUD, now with less merge conflict!
2014-11-22 03:27:10 -05:00
Ccomp5950
93ac9115a5
Merge pull request #7093 from PsiOmegaDelta/Tracking
...
AI can now track people with max level sensors.
2014-11-22 03:25:59 -05:00
ccomp5950
eb83d5ccec
Solves a runtime when someone tries to mop up blood.
...
proc name: afterattack (/obj/item/weapon/mop/afterattack)
source file: mop.dm,45
runtime error: undefined proc or verb /obj/effect/decal/cleanable/blood/tracks/footprints/clean().
2014-11-22 03:02:40 -05:00
Zuhayr
1c35f8825b
Dummied out the AI movement code for a later project.
2014-11-22 08:04:06 +10:30
Zuhayr
c8e8e663f9
Merge resolution.
2014-11-22 07:31:44 +10:30
Segrain
7f199874fb
Examining robomodules.
2014-11-21 19:28:46 +03:00
PsiOmega
71064574ed
Merge remote-tracking branch 'upstream/dev' into AirAlarms
...
Conflicts:
code/game/machinery/alarm.dm
2014-11-21 15:28:54 +01:00
PsiOmega
59aa4dfcc6
ERT and Xenobiology security HUD icons
...
Treats ERT members as officially recognized Central Command personnel.
Adds missing Central Command secHUD icon. Adds a temporary icon for Xenobiologists.
2014-11-21 14:46:54 +01:00
Amunak
5dab47c156
Updated the end of round messages for better fit
2014-11-21 13:35:41 +01:00
GinjaNinja32
116705b61b
Fixes wallets, makes CMC use alt-titles, actually remove dead block
2014-11-21 10:42:52 +00:00
Amunak
c6211b0eca
Fixed missing space in the printplayer proc output
2014-11-21 11:29:29 +01:00
Amunak
0743e0ddb3
Round end summary now shows full player list and more round information
2014-11-21 11:28:40 +01:00
GinjaNinja32
fe1700eabc
CMC can now get names from PDAs, and doesn't report Random Assistant's ID Card (Assistant)
2014-11-21 09:30:11 +00:00
PsiOmega
2a796f2ddd
Merge remote-tracking branch 'upstream/master' into dev
2014-11-21 10:27:56 +01:00
Neerti
72c9b2eb15
Resolves conflicts, cherrypicks my code.
2014-11-21 03:32:00 -05:00
PsiOmega
84b36f6208
AI can now track people with max level sensors.
...
Crew members with tracking sensors enabled can now be tracked without the need of camera coverage.
2014-11-21 08:33:20 +01:00
PsiOmegaDelta
350273dea4
Merge pull request #7071 from Segrain/dev
...
Equipping custom loadout.
2014-11-21 08:03:24 +01:00
PsiOmegaDelta
34e0019dad
Merge pull request #7085 from Hubblenaut/hud
...
MedicalHUD takes hardcrit in account
2014-11-21 08:02:31 +01:00
PsiOmegaDelta
921815df04
Merge pull request #6906 from mwerezak/faxmachine
...
Fax Machines
2014-11-21 08:02:21 +01:00
mwerezak
348c9d19f7
Merge remote-tracking branch 'upstream/dev' into faxmachine
...
Conflicts:
code/WorkInProgress/kilakk/fax.dm
code/modules/paperwork/faxmachine.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/paper_bundle.dm
code/modules/paperwork/photocopier.dm
maps/tgstation2.dmm
2014-11-20 14:57:35 -05:00
Hubblenaut
aeda763e81
MedicalHUD takes hardcrit in account
2014-11-20 18:42:17 +01:00
Atlantiscze
3003777b6a
Adds mwerezak's suggestions
...
- Power monitor is now /computer/ subtype
- Different rounding of values in power monitor display
- Unfortunately, PDA power monitoring for engineers is broken and probably won't be fixed as it relies on old powernet monitoring computers. Laptops work OK
2014-11-20 16:24:26 +01:00
Atlantiscze
20571bf1ce
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into powernet-sensors-mk2
2014-11-20 14:38:04 +01:00
PsiOmega
2fddc6a832
Less copy-pastah
...
Reduces copy-pasted code in the atmospheric monitor computer code.
2014-11-20 13:18:07 +01:00
Chinsky
614bb589c2
Merge pull request #7064 from PsiOmegaDelta/CanisterLogs
...
Canister Logs
2014-11-20 14:55:19 +03:00
Chinsky
3f80ee89d2
Merge pull request #6889 from PsiOmegaDelta/APC
...
BYOND akbar
2014-11-20 14:51:30 +03:00
Atlantiscze
78a4b424ae
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into powernet-sensors-mk2
2014-11-20 10:55:33 +01:00
