Kyep
1f65c9a734
CrazyLemon 1, all the minor issues
2018-08-06 21:08:01 -07:00
Kyep
45a88d4f3f
split teleportation changes out into another PR
2018-08-02 09:36:10 -07:00
Kyep
ce4775c6af
z6 mapmerge, teleportation.dm refactor, stop bluespace tomatoes working in tele_proof areas
2018-08-02 09:03:17 -07:00
Kyep
102ff67095
fixes merge conflict
2018-08-01 04:13:22 -07:00
Tails2091
fef2b4c002
we the good format now
2018-07-29 13:53:45 -04:00
Tails2091
b08653c35a
Changes while loop to for
...
Why was this a while loop?
2018-07-28 18:01:23 -04:00
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
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
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
Kyep
24e575da21
squash 2
2018-07-07 16:34:23 -07:00
Kyep
c3ed490159
Fox 4
2018-07-07 16:15:26 -07:00
Kyep
f7b0e03fc2
Fox 3
2018-07-07 16:14:01 -07:00
Kyep
6f5e8e1c18
Fox requests
2018-07-07 16:04:24 -07:00
datlo
0e9b583caf
Combined table and floor check
2018-07-07 07:50:31 +01: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
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
Kyep
3fb7a5e526
Merge remote-tracking branch 'ParadiseSS13/master' into depot
2018-06-28 18:02:48 -07:00
Kyep
7d361cf59b
made some traps fairer
2018-06-22 01:05:03 -07: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
9660aac6d2
fix docs, change timing
2018-06-17 21:39:17 -07:00
Kyep
5e6407e3f8
Merge remote-tracking branch 'ParadiseSS13/master' into depot
2018-06-13 23:42:36 -07: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
Anasari
b6272b50fc
Changes the code to work more flexibly
2018-06-13 13:41:27 +08:00
