Commit Graph

9424 Commits

Author SHA1 Message Date
variableundefined
62d0df33ea Merge pull request #16998 from lewcc/med-scanner-rads
Add radioactive message to health analyzer
2021-10-31 22:25:16 -05:00
variableundefined
c0e21aa64e Merge pull request #16996 from hal9000PR/bnuuy
Adds Bunnies.
2021-10-31 22:24:31 -05:00
lewcc
bbf92a4d1a to_char -> to_chat 2021-10-27 10:05:13 -04:00
lewcc
812b58acd7 Add note for user rad contamination 2021-10-27 01:40:41 -04:00
PacifistDalek
f486448a95 Food Cart Refactor (#16869)
* Food Cart Refactor

* delete unused old sprites

* No longer can be deconstructed or destroyed into smartfridge parts
2021-10-26 23:33:03 +01:00
Vi3trice
758908e5ff CE closet has an RCD (#16820) 2021-10-26 23:32:38 +01:00
SabreML
945e00e497 IAA locker, spare headsets, and general locker cleanup (#16440)
* Locker + Bookcase tweaks

* HoS flask
2021-10-26 23:09:45 +01:00
hal9000PR
e5afa54965 Merge remote-tracking branch 'upstream/master' into bnuuy 2021-10-26 19:53:15 +01:00
hal9000PR
f095264807 bnuuy 2021-10-26 19:47:41 +01:00
matttheficus
fd3b0f9e05 this should do it (#16971) 2021-10-18 22:50:20 +01:00
SabreML
ab7e8f0f38 Fire extinguisher GC fix (#16965) 2021-10-18 17:12:54 +01:00
dearmochi
6e0006a145 Fixes fire axe wielded inhand sprite regression (#16967) 2021-10-18 16:16:11 +01:00
E-MonaRhg
f9c672ffa2 A lesson in testing your PRs (#16969) 2021-10-18 16:15:54 +01:00
variableundefined
066cd3be7b Merge pull request #16932 from matttheficus/TrayQOL
Serving Tray Quality of Life - 8 Slots
2021-10-17 13:51:00 -05:00
variableundefined
edd1781e38 Merge pull request #16943 from E-MonaRhg/more-carpets
Carpet bomb your station: 8 more carpet types and a carpet cargo crate
2021-10-17 13:30:03 -05:00
SabreML
146351ae82 Cigarette overlay update (#16936) 2021-10-15 11:00:26 +01:00
E-MonaRhg
310616cdf3 Carpet bomb your local station 2021-10-14 20:23:11 +02:00
matttheficus
468ff53ac7 8 because i cant count 2021-10-13 17:27:38 -04:00
matttheficus
ee16debc62 oh god does this work 2021-10-13 17:22:53 -04:00
dearmochi
28f0035172 Prevent stunbatons from stunning AIs (#16919) 2021-10-11 20:49:38 +01:00
S34N
f01f5adae4 makes electrochromic window spawners use a unique icon (#16834) 2021-10-09 17:09:47 +01:00
Mieszko Jędrzejczak
7c39eafafe midori-san (#16856) 2021-10-09 17:06:43 +01:00
Luc
2908f321be Fix fireaxe cabinet not dropping the axe when destroyed (#16880)
* Move fireaxe item init later, make sure destroy properly forcemoves it too

* Normal locker code can clean up after itself

* Remove extra space, oops

* remove parent call

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2021-10-09 16:47:52 +01:00
Qwertytoforty
40eb870732 Polishes up and fixes bugs with the syndicate teleporter (#16844)
* Polishes up and fixes bugs with the syndicate teleporter

* snake case

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-10-07 16:38:23 +01:00
S34N
952cfd7dc4 why was his done this way, wtf (#16877) 2021-10-04 20:17:00 +01:00
Farie82
2d13c33906 Makes laser pointers not go through walls (#16871)
* Makes laser pointers not go through walls

* Add comment

* Use the laserpointer instead as center
2021-10-04 20:15:10 +01:00
variableundefined
fb50ea1ce9 Merge pull request #16846 from Exavere/Fixes-tinted-windows-hoorah
Fixes Electrochromatic Window Material Return
2021-10-03 20:47:31 -05:00
Vi3trice
4b29431236 Makes the fireaxe visible on the back, and wow one line fix again? 2021-10-03 18:51:51 -04:00
Fox McCloud
2790d94891 Merge pull request #16850 from AffectedArc07/removes-spacepods
Nukes spacepods and associated jobs
2021-10-03 15:50:08 -04:00
Vi3trice
8d1aef2013 Why call it do_the_flick if you don't flick (#16853) 2021-10-03 11:50:08 +01:00
AffectedArc07
129318891d Nukes spacepods and associated jobs 2021-10-02 13:16:24 +01:00
Exavere
8dea214a44 Fixes Electrochromatic Windows 2021-10-01 16:34:10 -05:00
Fox McCloud
ee22c8d4ee Refactors Item Blood Overlays (#16826)
* Refactors Item Blood Overlays

* update

* remove blood color changing
2021-10-01 21:57:54 +01:00
variableundefined
5cbc724e8f Merge pull request #16808 from Vi3trice/gateway-is-compliant-with-air-force-one-stargate
Fix - Wheelchair users can go into the gateway
2021-09-30 17:53:58 -05:00
Fox McCloud
0eac5b812c Merge pull request #16798 from SabreML/telescopic-blood-overlays
Blood overlay fix for telescopic weapons
2021-09-28 00:31:41 -04:00
Vi3trice
64c18ca3e8 Wheelchair is cooperative with gateways now 2021-09-25 20:02:20 -04:00
variableundefined
5df60f3060 Merge pull request #16794 from Vi3trice/you-shall-not-pass
Fix - Ordinal railings block properly, rotations are done in 45°
2021-09-24 20:21:03 -05:00
variableundefined
580b838686 Merge pull request #16790 from S34NW/tweak_chain_fences
Makes uncuttable chainlink fences deconstructable
2021-09-24 20:08:35 -05:00
Fox McCloud
1c40951338 Ports Cloth Golems 2021-09-24 19:48:15 -04:00
SabreML
51c2c8840d Telescopic baton/scythe blood overlay fix 2021-09-25 00:11:56 +01:00
Vi3trice
0349f2cddd comment 2021-09-24 13:45:48 -04:00
Vi3trice
398c471698 Might as well make it its own check if we're going to use it in two places 2021-09-24 13:39:27 -04:00
Vi3trice
b145ab1f4c Corners aren't cosmetic anymore 2021-09-24 13:04:04 -04:00
S34N
6b36aabfc0 Update code/game/objects/structures/fence.dm
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2021-09-24 14:45:23 +01:00
S34NW
01720b93bb farie pt2 2021-09-24 12:06:45 +01:00
S34NW
f45117b9fe farie review 2021-09-24 11:41:03 +01:00
S34NW
215ec7cbe3 return nesting mistake 2021-09-24 11:11:38 +01:00
S34NW
622adb4ba5 makes uncuttable fences dismantlable 2021-09-24 11:07:31 +01:00
variableundefined
29f43ea3da Merge pull request #16732 from Qwertytoforty/red-blue-green
Changes the description of a drop of blood
2021-09-23 18:32:19 -05:00
variableundefined
b44432b8b8 Merge pull request #16667 from Fox-McCloud/secborg-purge-borg-tweaks
Removes Secborg, Tweaks Borgs: Combat Rework Edition
2021-09-21 08:41:22 -05:00