Commit Graph

22674 Commits

Author SHA1 Message Date
Zuhayr
14b124a97e Duct tape can now be used to gag, blindfold or cuff people, and cable cuffs/duct tape can restrain rig-wearing people (poorly). 2015-12-11 15:54:04 +10:30
Zuhayr
2edf2c499f POCKET SAND! 2015-12-11 15:53:40 +10:30
Zuhayr
db7121ab7a Made antag indicators layer over darkness. 2015-12-11 15:53:29 +10:30
Zuhayr
5bf4d2599b Renamed silicates to sand. 2015-12-11 15:53:23 +10:30
Zuhayr
4c904dc782 Oxygen tanks now have a visual indicator of their pressure on the item icon. 2015-12-11 15:52:54 +10:30
Zuhayr
10bee3618c Bats can now be slung over your back. 2015-12-11 15:52:29 +10:30
Zuhayr
d2e092c899 Diona nymphs and fruit are now able to be holstered. 2015-12-11 15:52:22 +10:30
Zuhayr
07874b9ca8 Holsters will now show as 'occupied' on examine if something is in them. 2015-12-11 15:52:05 +10:30
Zuhayr
b2ab041c3f Added checks for character age to numerous jobs. 2015-12-11 15:07:28 +10:30
Zuhayr
999291fc94 Added minimum ages to head roles. 2015-12-11 15:04:16 +10:30
Earthcrusher
77ecd5a24e Adds a price to the new vending machine cigarettes. 2015-12-10 18:58:23 -06:00
Neerti
f28a0405a8 Merge pull request #513 from Hubblenaut/tape
New Police Tape Icons and Placing Algorithms
2015-12-10 19:51:09 -05:00
Neerti
5dbbbaa80b Merge pull request #456 from Zuhayr/master
Porting forensics from Aurora.
2015-12-10 19:50:44 -05:00
Woodratt
8699298496 Merge pull request #517 from Woodratt/1.2.8_stockingsnboxers
1.2.8 fishnetsnstockings
2015-12-10 14:52:10 -08:00
woodratt
d5dcbebcfd 1.2.8
- Added fishnet stockings
- Added four different boxers
- Added five different female underwear choices
- Added one blue striped shirt
2015-12-10 14:46:46 -08:00
zaredman
84832f8a9d Merge pull request #515 from EmperorJon/10_Dec._Removes_grimderp_AI_news_event
Changes the description for the AI SYSTEMATICALLY KILLING CIVILIANS GRIMDEERRRRP news event
2015-12-10 17:11:45 -05:00
Jon
5d3e3cf863 Removes the AI SYSTEMATICALLY KILLING CIVILIANS GRIMDEERRRRP news event. Replaces the message with one saying it simply caused damage. 2015-12-10 21:35:35 +00:00
Hubblenaut
4c0548b534 Adds directional client support for police tapes 2015-12-10 21:28:21 +01:00
Neerti
a9e7783bcb Merge pull request #511 from Woodratt/1.2.7_map_fixes2
1.2.7 Map Fixes and sprite additions
2015-12-10 13:50:01 -05:00
Neerti
a25c728c07 Merge pull request #509 from Hubblenaut/master
Fixes onmob icons for holders
2015-12-10 13:40:31 -05:00
woodratt
be97cbaf48 1.2.7 Map Fixes and sprite additions
- Soda fountains added to heist base and merc base. Flamethrowers removed.
- Reduced the amount dufflebags can carry to 12 slots
- Additional shuttles added to captain's office, bridge hallway, hop office, engineering engine area, chapel, security restroom.
- Double disposal pipes and atmos pipes removed from several areas.
- Tweaked engineering restroom
- Two communicators added to the map, hotel area and civilian lockeroom.
- Groundwork added for head of staff folders added.
2015-12-10 10:35:38 -08:00
Hubblenaut
d4766aa09a Atmos personal locker spawn with atmos tape roll
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
2015-12-10 19:27:04 +01:00
Hubblenaut
5f28c7cfad Police tape rewrite 2015-12-10 19:25:26 +01:00
Hubblenaut
9980b7ef13 Fixes onmob icons for holders 2015-12-10 19:17:13 +01:00
Neerti
ef5c20f9b3 Merge pull request #506 from Hubblenaut/master
Fixes Cable Merging and Floor Placing
2015-12-10 12:45:02 -05:00
Neerti
9d4d8e3998 Merge pull request #508 from Hubblenaut/flavor
Tiny Fixes
2015-12-10 12:44:43 -05:00
Hubblenaut
a046ad73ca Fixes backup power test light 2015-12-10 18:07:35 +01:00
Hubblenaut
95a190ae30 Fixes empty flavor text drawing two spaces 2015-12-10 18:07:00 +01:00
Hubblenaut
76577f2696 Fixes subcategories of cable coils not being mergeable 2015-12-10 16:28:44 +01:00
Hubblenaut
5baf93722a Fixes subcategories of floor tiles not being placable 2015-12-10 16:28:40 +01:00
GinjaNinja32
0f2b17f7bb fix #11631 2015-12-10 13:01:06 +00:00
PsiOmegaDelta
ddb5fa9248 Syndicate id card now checks if the player mind an antag.
Instead of the player mob itself.
Fixes https://github.com/PolarisSS13/Polaris/issues/389.
2015-12-10 10:55:55 +00:00
GinjaNinja32
6c736adfbb fix autohiss for fully-capitalised strings 2015-12-10 10:55:41 +00:00
GinjaNinja32
1b2a068d7e fix #11637 2015-12-10 10:55:31 +00:00
ccomp5950
f0b6a933aa Ninjas teleporter: Checks Z levels and distance.
Ninjas are able to use a camera console and teleport across the map.  This resolves that.
2015-12-10 10:55:13 +00:00
Zuhayr
906318d3fc Compile fixes. 2015-12-10 19:22:15 +10:30
Zuhayr
4376948bdf Forensics fixes/tweaks. 2015-12-10 19:20:09 +10:30
Zuhayr
565e39a28f Porting forensics from Aurora. 2015-12-10 19:16:28 +10:30
PsiOmegaDelta
c4d6a76887 Merge pull request #11649 from Baystation12/master
Dev-freeze
2015-12-10 08:21:43 +01:00
Neerti
0b5f18ab39 Removes debug world << output from holidays. 2015-12-10 00:50:42 -05:00
Neerti
e1694c40fe Merge pull request #483 from Hubblenaut/ttv
Ports Bay Fixes for TTV Yield
2015-12-09 22:30:25 -05:00
Zuhayr
e9cdc8a0f5 Fixes #9257 2015-12-10 11:57:34 +10:30
Zuhayr
7a9d7bf0c9 Fixes #10753 2015-12-10 10:41:48 +10:30
Zuhayr
f1630108db Fixes #10915 2015-12-10 10:32:35 +10:30
Zuhayr
d5447d9e95 Fixes #10838 2015-12-10 10:23:49 +10:30
Zuhayr
d6514ff2f2 Merge pull request #11646 from Ccomp5950/ninja_VANISH
Ninjas teleporter:  Checks Z levels and distance.
2015-12-10 09:54:49 +10:30
ccomp5950
f6f6a4ef87 Ninjas teleporter: Checks Z levels and distance.
Ninjas are able to use a camera console and teleport across the map.  This resolves that.
2015-12-09 17:27:27 -05:00
GinjaNinja32
a1f22d19b2 Merge pull request #11640 from PsiOmegaDelta/151209-LoadoutSafetyMeasures
Gear loadout sanity checking.
2015-12-09 21:34:48 +00:00
GinjaNinja32
1a46db4aaf fix #11637 2015-12-09 17:04:24 +00:00
PsiOmegaDelta
12b9d30923 Gear loadout sanity checking.
Adds gear loadout sanity checking to reduce the risk of https://github.com/PolarisSS13/Polaris/issues/376 from happening, as well as ' /datum/'.
2015-12-09 12:27:41 +01:00