058d339493
Merge pull request #9336 from Kyep/depot_fixes_1
...
Depot Fixes
2018-08-22 22:33:09 -07:00
b3f5af433a
Merge pull request #9371 from variableundefined/DefibPaddleDetach
...
Defib paddles snap away if you walk away from the defib
2018-08-22 22:27:03 -07:00
bf8520528c
Merge pull request #9257 from variableundefined/WelderCableOverheal
...
Adds overheal to welder & cable coil
2018-08-22 22:15:38 -07:00
80123d90ad
Stop implantcase from disappearing
2018-08-22 22:36:02 +08:00
845401725e
Defib paddles snap away if you walk away from the defib
2018-08-16 21:49:39 +08:00
1e894f11ee
CrazyLemon RPD changes
2018-08-15 22:36:53 -07:00
7cebfc20c4
fixes for RPD and RCS exploits
2018-08-15 01:48:34 -07:00
1f65c9a734
CrazyLemon 1, all the minor issues
2018-08-06 21:08:01 -07:00
45a88d4f3f
split teleportation changes out into another PR
2018-08-02 09:36:10 -07:00
ce4775c6af
z6 mapmerge, teleportation.dm refactor, stop bluespace tomatoes working in tele_proof areas
2018-08-02 09:03:17 -07:00
102ff67095
fixes merge conflict
2018-08-01 04:13:22 -07:00
eaf4d642cb
Adds overheal to welder & cable coil
2018-07-26 22:22:50 +08:00
b2d0bb1c0b
Fixes maploading so that the cyberiad and space hotel load cleanly again
2018-07-24 20:58:38 -07:00
d4bada645a
Fixes invisible egg and donut boxes
...
Also removed duplicate instances of the pizza box icons
2018-07-22 15:33:21 -04:00
c6bb2ecd4d
abductor stuff
2018-07-18 19:51:22 -04:00
7440dad57e
further conversion
2018-07-18 01:13:24 -04:00
aae5405d03
AGHHHHHHHHHHHHHHHHHHH WHATTT
2018-07-17 04:58:36 -04:00
9c3fcaa53c
AGHHHHHHHHHHHHH
2018-07-17 02:13:52 -04:00
384fe93d33
Merge pull request #8975 from Citinited/rpd-refactor
...
RPD refactor
2018-07-16 14:22:38 -07:00
29c6e6d69b
A bunch of refactoring; RPD runtimes if a forbidden pipe is attempted to be dispensed; names loose disposals pipes
2018-07-16 00:23:03 +01:00
b2c8f051b1
Merge remote-tracking branch 'upstream/master' into camera-damage-refactor
2018-07-15 16:31:50 -04:00
74f7028fa7
Merge pull request #9177 from datlo/RSFfix
...
Fixes Service Borg's RSF being unable to dispense items on floors
2018-07-11 12:43:30 -07:00
9463807ac2
done
2018-07-09 05:45:01 -04:00
27ebe7a6fe
Standardized Robotic Organ Checking--Removes Mechassited Organs
2018-07-07 21:33:42 -04:00
c3ed490159
Fox 4
2018-07-07 16:15:26 -07:00
0e9b583caf
Combined table and floor check
2018-07-07 07:50:31 +01:00
fcdb0fe54b
Merge pull request #9172 from Fox-McCloud/no-lances
...
Removes Explosive Lances
2018-07-06 15:01:07 -07:00
e4215cf0f5
Actually allows RSF to spawn on floors
...
derp'd
2018-07-06 06:57:53 +01:00
d26b4c4e7e
Allows RSF to spawn items on floors
2018-07-06 06:37:52 +01:00
84ae085166
Changes RSF error message to be more accurate
...
The RSF cannot, in fact, create service items on floors. As amusing as
dosh on every floor tile would be, I think it's best to just change the
message and not functionality.
2018-07-05 16:10:53 +01:00
9697bd082f
Merge pull request #9171 from Citinited/jon-is-no-longer-custom
...
Fixes spelling error
2018-07-03 15:47:57 -07:00
319a6cd500
Removes Explosive Lances
2018-07-03 18:13:51 -04:00
a7dc1d70e9
Fixes speling error
2018-07-03 16:30:30 +01:00
3fb7a5e526
Merge remote-tracking branch 'ParadiseSS13/master' into depot
2018-06-28 18:02:48 -07:00
7d361cf59b
made some traps fairer
2018-06-22 01:05:03 -07:00
868167d84c
Fix cardboard drop count
2018-06-19 13:38:02 -07:00
8dcc35edd5
Fixes Home-Run Bat Charge
2018-06-18 16:48:12 -04:00
5e6407e3f8
Merge remote-tracking branch 'ParadiseSS13/master' into depot
2018-06-13 23:42:36 -07:00
412341439a
Fixes #8954 - splits 'attack log' preference, spam-be-gone ( #8992 )
...
* Fixes #8954
* projectile reagetns
* removes all attack logs on keyless simple_animals even by keyed mobs
* deletes 'potentially'
* Tiger request
* more comprehensive solution
* check for mob
* istype
* brevity
* Split attack logs preference
* toggle
* deletes old CHAT_ATTACKLOGS
* explains what levels do when toggling them
* clarification
* Tigercat requests
2018-06-13 16:55:21 -07:00
124f1518ce
Merge remote-tracking branch 'upstream/master' into two-handed
...
# Conflicts:
# code/game/objects/items/weapons/twohanded.dm
2018-06-13 17:29:37 -04:00
32f7e22005
Merge pull request #9080 from Fox-McCloud/medbot-clean-up
...
Cleans Up Medibot Code, Re-Allows Syndicate Medibot
2018-06-13 13:57:05 -07:00
4d4eb16a3a
fixes merge conflict
2018-06-06 16:32:31 -07:00
4531bc2337
tweaks
2018-06-03 19:26:48 -04:00
7f2f766f70
Merge remote-tracking branch 'upstream/master' into attack-hulk
...
# Conflicts:
# code/game/objects/structures/window.dm
2018-06-03 18:49:44 -04:00
75bded82cf
added defines for window construction states and full window diagonal dir
...
added a proc to check for valid window location, added var/fulltile to windows instead of using a proc
added clockwork windoors and windows to brass recipes
added titanium glass and plastitanium glass, made glass types use recipes like other stacks, you can smelt the new glasses in the ORM
removed force from RCD and added NOBLUDGEON flag, fixing a bug where you couldn't deconstruct airlocks with an RCD
slight nerf to wielded fireaxe, does high damage to windows and grilles instead of insta-deleting them
deleted fullwindow.dm and moved windows to window.dm
added some feedback to placing glass on grilles
examining windoor assembly shows you can rotate it, examining windows show deconstruction hints and rotation
added cracks to windows, you can repair windows using a welding tool on help intent, slight buff to window health
added var/cancolor to windows and blacklists some windows from being auto-colored, window shards also get colored on narsie_act()
full windows now use icon smoothing system, windows now use the obj_integrity damage system
added is_glass_sheet() helper
2018-06-03 13:11:37 +04:00
2a310f3539
Renames a bunch of variables; prevents possible exploit
2018-06-02 08:52:31 +01:00
d978472d27
RPD nanoUI improvement; misc. code tweaks
2018-05-31 22:44:10 +01:00
14ba039d81
GLOB
2018-05-30 21:47:03 +01:00
2ec3c797fd
RPD refactor: part 2
2018-05-30 21:47:03 +01:00
ce42a6d952
RPD refactor
...
Adds rpd_act proc to do stuff instead of doing it all in one big
afterattack proc
Removes RPD_ALLOWED_HERE flag as it is now redundant
2018-05-30 21:47:02 +01:00
Crazy Lemon