PsiOmega
7182ff9c3f
/tg/ input stripping.
...
Borrows /tg/ html stripping code.
Ghosts are the first to be given this boon, they now have to deliberately emote things like "Spooky man and it#36&;s friends type crap".
2014-11-21 18:32:51 +01:00
Segrain
078d6f74a5
Robotic flavour texts.
2014-11-21 19:32:40 +03:00
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
MagmaRam
ee4ea4977c
Adds inhand sprites for the captain's tunic and jacket
2014-11-21 08:14:57 -05: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
0379acad97
Fixes a runtime I made by improper conflict resolution.
2014-11-21 03:47:38 -05: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
PsiOmegaDelta
e3ef3b7347
Merge pull request #7081 from MagmaRam/bugfix
...
Fixes paper bundles not burning properly with a match
2014-11-21 08:02:13 +01:00
mwerezak
aaba7e5c74
Adds intent-based firing control to guns
2014-11-20 23:10:47 -05:00
sabiram
bdf4905289
I am dumb
...
It is what it is.
2014-11-20 17:08:24 -05:00
sabiram
f5a196b930
Removes extra breaks
...
I am dumb
2014-11-20 16:26:31 -05:00
sabiram
5d461f4976
Custom item deleted and added to loadout pool
2014-11-20 16:18:35 -05:00
mwerezak
1751caa64f
Adds skrell headtail items
2014-11-20 15:51:52 -05: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
mwerezak
8a975fec06
Removes interdepartment fax cooldown
2014-11-20 14:36:05 -05:00
mwerezak
d552839c0b
Fixes #7068
2014-11-20 14:23:40 -05:00
mwerezak
e6b5d4cf77
Skrell icon/appearance changes
...
Adds desaturated skrell body and hair sprites, fixed colour skrell eyes,
and blood colour as requested by Searif.
2014-11-20 13:10:42 -05:00
Hubblenaut
aeda763e81
MedicalHUD takes hardcrit in account
2014-11-20 18:42:17 +01:00
Hubblenaut
70db4b52e8
Relocates combat log proc as a child of unarmed_attack, adds procs for
...
checking antagonists and close combat modifiers
2014-11-20 17:42:40 +01:00
PsiOmega
714a14776f
Research Isolation Cells
...
The research cells are now even more isolated.
2014-11-20 16:53: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
PsiOmegaDelta
1e6028b49e
Merge pull request #7055 from atlantiscze/dem-shields
...
Fixes renwick shield generators incorrectly using power
2014-11-20 15:11:33 +01:00
Atlantiscze
b6c7454f52
Fixes possible runtime when sensor is destroyed while open in computer.
2014-11-20 14:45:12 +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
Atlantiscze
cd187ae046
Nicer monitor GUI
...
- Instead of showing all sensor readings in one ugly ultra-long screen, selection menu for sensors is used.
2014-11-20 14:21:55 +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
MagmaRam
587f29e5d3
Fixes paper bundles burning strangely with a match and burning one paper at a time, leaving a lone paperclip at the end that would eat any paper added to it and never let that paper be interacted with. Paper bundles now burn the same way (whole thing at once) no matter what you're burning it with, rather than only burning that way with a lighter.
2014-11-20 05:08:38 -05:00
Atlantiscze
78a4b424ae
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into powernet-sensors-mk2
2014-11-20 10:55:33 +01:00
MagmaRam
72b0000f6a
Fixes a bug where core samplers dispensed bags that you could not take rock slivers out of.
2014-11-20 00:41:43 -05:00
MagmaRam
0eed2c2fa6
Fixes the xenoarch eguns.
...
This was done by making the xenoarch eguns new subtypes with different update_icon() procs than the regular eguns. The new subtypes are in finds_eguns.dm
2014-11-19 22:42:58 -05:00
MagmaRam
77c883cc6d
Fixes missing icons for xenoarchaeology items EXCEPT for the energy guns.
2014-11-19 21:35:34 -05:00
Chinsky
af6a262a2c
Merge pull request #7059 from PsiOmegaDelta/Headsets
...
Dynamic Headset Description
2014-11-20 02:41:08 +03:00
Chinsky
8015bb55f8
Merge pull request #7070 from Amunak/airalarm-fix2
...
fixed a bug that made it impossible for AIs to change air alarm sensor settings
2014-11-20 02:40:04 +03:00
MrSnapwalk
07441e1e61
Attempting to fix conflicts with the following files:
...
icons/mob/head.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-11-19 13:54:28 -06:00
Segrain
bec483aa1b
Alphabetical sorting.
2014-11-19 19:05:06 +03:00
Segrain
c4d95c39f1
Folders, fixes.
2014-11-19 18:42:34 +03:00
Segrain
a475247f11
Proper slot equipment.
2014-11-19 18:35:44 +03:00
