Fox McCloud
8860a0a194
Merge pull request #9206 from Crazylemon64/maploader_fixup
...
Fixes maploading so that the cyberiad and space hotel load cleanly again
2018-07-26 23:25:21 -04:00
Crazylemon64
b2d0bb1c0b
Fixes maploading so that the cyberiad and space hotel load cleanly again
2018-07-24 20:58:38 -07:00
variableundefined
c9d05c6bb1
Lazylen!
2018-07-25 07:21:48 +08:00
variableundefined
973affbe44
Fixes runtime error from medical kit change
2018-07-24 20:43:44 +08:00
FalseIncarnate
d4bada645a
Fixes invisible egg and donut boxes
...
Also removed duplicate instances of the pizza box icons
2018-07-22 15:33:21 -04:00
FalseIncarnate
26eb849509
merge conflict
2018-07-21 20:26:31 -04:00
Crazy Lemon
a5f2cb35cd
Merge pull request #9223 from Fox-McCloud/what-is-this-species
...
Makes Species datum Non-Global
2018-07-21 17:01:33 -07:00
Fox McCloud
e1419cbd86
Merge pull request #9207 from Crazylemon64/admin_speed_process
...
Adds an admin VV button to make any object speed process
2018-07-21 17:32:14 -04:00
Fox McCloud
c6bb2ecd4d
abductor stuff
2018-07-18 19:51:22 -04:00
Fox McCloud
7440dad57e
further conversion
2018-07-18 01:13:24 -04:00
Fox McCloud
aae5405d03
AGHHHHHHHHHHHHHHHHHHH WHATTT
2018-07-17 04:58:36 -04:00
Fox McCloud
9c3fcaa53c
AGHHHHHHHHHHHHH
2018-07-17 02:13:52 -04:00
Crazy Lemon
384fe93d33
Merge pull request #8975 from Citinited/rpd-refactor
...
RPD refactor
2018-07-16 14:22:38 -07:00
FalseIncarnate
f6de415d36
Food icon reorganization
...
Moved around some food icons, to reduce clutter in the food.dmi file
Notable moves:
- All custom food icons are now in a new file custom.dmi
- All pizza icons (food and boxes) are now in a new file pizza.dmi
- All pasta food icons are now in a new file pasta.dmi
Also removed some duplicate icons, renamed some custom food icons for
better clarity, adjusted existing code to point to new icon locations
2018-07-15 20:46:24 -04:00
Citinited
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
Fox McCloud
b2c8f051b1
Merge remote-tracking branch 'upstream/master' into camera-damage-refactor
2018-07-15 16:31:50 -04:00
Crazy Lemon
7e78920505
Merge pull request #9045 from Anasari/AdvancedKit
...
Medical kit now uses overheal on eligible attached limbs
2018-07-13 21:52:36 -07:00
Crazylemon64
5ad5b7382b
Adds a var_edited update so it leaves fingerprints
2018-07-13 14:14:10 -07:00
Crazy Lemon
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
Fox McCloud
9463807ac2
done
2018-07-09 05:45:01 -04:00
Fox McCloud
27ebe7a6fe
Standardized Robotic Organ Checking--Removes Mechassited Organs
2018-07-07 21:33:42 -04:00
datlo
0e9b583caf
Combined table and floor check
2018-07-07 07:50:31 +01:00
Crazy Lemon
2a0733a008
Merge pull request #9151 from Fox-McCloud/pistol-change-loot
...
Stechkin Maintenance Pistol Change
2018-07-06 18:12:29 -07:00
tigercat2000
fcdb0fe54b
Merge pull request #9172 from Fox-McCloud/no-lances
...
Removes Explosive Lances
2018-07-06 15:01:07 -07:00
datlo
e4215cf0f5
Actually allows RSF to spawn on floors
...
derp'd
2018-07-06 06:57:53 +01:00
datlo
d26b4c4e7e
Allows RSF to spawn items on floors
2018-07-06 06:37:52 +01:00
datlo
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
tigercat2000
9697bd082f
Merge pull request #9171 from Citinited/jon-is-no-longer-custom
...
Fixes spelling error
2018-07-03 15:47:57 -07:00
Fox McCloud
319a6cd500
Removes Explosive Lances
2018-07-03 18:13:51 -04:00
Citinited
a7dc1d70e9
Fixes speling error
2018-07-03 16:30:30 +01:00
alexkar598
a15ae140f2
Signs are pointing me that there will be a clone arm-oh wait...the signs were just exploited by the clown and duplicated
2018-07-02 15:15:58 -04:00
Anasari
0fbec396c8
Fixes
2018-07-01 16:54:06 +08:00
Anasari
1beb0c275e
Fixes colons and other things
2018-07-01 15:38:05 +08:00
Fox McCloud
6c9f83f685
Stechkin Maintenance Pistol Change
2018-06-30 19:24:56 -04:00
Superhats
a186a85c62
Update chairs.dm
2018-06-21 18:24:50 +02:00
Superhats
756fecc1f3
Update chairs.dm
2018-06-21 18:07:07 +02:00
MINIMAN10000
868167d84c
Fix cardboard drop count
2018-06-19 13:38:02 -07:00
Fox McCloud
8dcc35edd5
Fixes Home-Run Bat Charge
2018-06-18 16:48:12 -04:00
Kyep
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
tigercat2000
4e758344d3
Merge pull request #9050 from Fox-McCloud/weather-subsystem
...
Converts and Updates Weather Subsystem
2018-06-13 16:08:02 -07:00
Fox McCloud
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
tigercat2000
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
Fox McCloud
5fb13096a2
Merge remote-tracking branch 'upstream/master' into weather-subsystem
...
# Conflicts:
# code/__DEFINES/layers.dm
2018-06-13 16:56:19 -04:00
tigercat2000
910d741382
Merge pull request #9043 from PigeonLord/paraboot
...
Added magboots in the Paramedic's EVA Gear closet
2018-06-13 13:29:39 -07:00
Anasari
b6272b50fc
Changes the code to work more flexibly
2018-06-13 13:41:27 +08:00
Fox McCloud
4531bc2337
tweaks
2018-06-03 19:26:48 -04:00
Fox McCloud
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
uraniummeltdown
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
Citinited
2a310f3539
Renames a bunch of variables; prevents possible exploit
2018-06-02 08:52:31 +01:00
tigercat2000
49e49591a1
Merge pull request #9075 from Anasari/AttackLogImprove
...
Improved (ish) attack log logging
2018-06-01 20:52:42 -07:00
