2935 Commits

Author SHA1 Message Date
Fox McCloud 06df88706f Beginnings of Combat Changes: Ranged Weaponry (#17075) 2021-11-11 21:24:02 +01:00
Vi3trice 1a99534125 Oh fireaxe closet why you so bloated 2021-11-08 19:37:53 -05:00
variableundefined 9f2f9ac45e Merge pull request #17038 from E-MonaRhg/carpet-stuff-two
The Subsequent Carpet PR: tweaks and tables edition
2021-11-07 10:24:47 -06:00
Cocacolagua 2d8f2f75bc Wall-locker fixes (#17051)
* fixes wall lockers

* removes invisible locker
2021-11-07 09:02:56 +01:00
S34N 44c12c6d9d Fixes open crate sprites (#17050)
* fakin underscores

* more crates

* sneak this one in too
2021-11-06 21:42:47 +01:00
variableundefined 1739f411a2 Merge pull request #16823 from S34NW/3/4th-closet
3/4ths Sprite Project: Closets
2021-11-06 14:19:14 -05:00
E-MonaRhg ac68ea59df Carpet and table stuff 2021-11-05 19:46:42 +02:00
variableundefined 6102145ded Merge pull request #16909 from S34NW/tg_plant_stuff
Ports better grass and jungle objects used in TG
2021-11-05 08:37:54 -05:00
S34NW 44d8d455bf merge conflict part 2 2021-11-01 10:18:51 +00:00
S34NW 1723e0b503 Merge branch 'master' into 3/4th-closet 2021-11-01 10:14:41 +00:00
variableundefined c0e21aa64e Merge pull request #16996 from hal9000PR/bnuuy
Adds Bunnies.
2021-10-31 22:24:31 -05:00
mochi c7046c0756 Merge branch 'master' into hair-gradients 2021-10-27 13:33:12 +02: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
S34NW 7a8da30830 grass time 2021-10-10 15:20:13 +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
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
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
S34NW 5dc80d6cba steel pass 2 2021-10-02 22:26:37 +01:00
S34NW e78613e591 steel initial changes 2021-10-02 22:02:43 +01:00
AffectedArc07 129318891d Nukes spacepods and associated jobs 2021-10-02 13:16:24 +01:00
S34NW c860b48c22 correct overlay adding format 2021-10-02 00:49:15 +01:00
Exavere 8dea214a44 Fixes Electrochromatic Windows 2021-10-01 16:34:10 -05:00
S34NW 9820105059 final round of fixes 2021-09-28 12:18:38 +01:00
S34NW 83f8fbdfac locker door and open state trimming 2021-09-28 00:51:19 +01:00
S34NW 1c867b414c HERE COME THE CLOSETS 2021-09-27 19:33:42 +01: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
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 fa3fa1dc6a Merge pull request #16579 from FlattestGuitar/armor-defines
Adds defines for damage flags
2021-09-17 22:10:20 -05:00
Vi3trice 42571c3f4d Gives the wheelchair its own stack value 2021-09-12 12:18:35 -04:00
S34NW 9dc099ddc3 you now vault over railings, instead of weird things 2021-09-11 14:11:20 +01:00
S34NW 417f45eb88 more farie code things 2021-09-11 11:40:19 +01:00
S34NW fa8d8515af farie fixes 2021-09-11 11:18:39 +01:00
S34NW 235ee0c4ac we dont need these args either 2021-09-11 09:10:12 +01:00
S34NW e41c8ec849 railing rotate 2021-09-11 09:08:57 +01:00
S34NW 1d6a0c643b projectiles and big fences are nice too 2021-09-10 22:26:35 +01:00