8930946f69
increases delay before queen auto-nests, to give players more chance to catch an un-nested queen
2018-03-29 20:16:29 -07:00
e59933b7b0
follows convention: ENVIRONMENT_SMASH_RWALLS from UM's PR 8674
2018-03-29 20:16:04 -07:00
d8677acc58
fixes merge conflict in prince.dm
2018-03-29 20:06:41 -07:00
a7bab46b3b
Removes Stat Throttle
2018-03-28 15:50:58 -04:00
067f5cf8e8
Merge pull request #8717 from GunDOSMk1/Norstead's-Fluff
...
Norstead's fluff : Soviet Casual Uniform
2018-03-28 15:41:18 -04:00
5701ea7c75
Ports Nano UI to Subsystems
2018-03-26 23:59:52 -04:00
c13ce9099f
Merge pull request #8810 from Fox-McCloud/sun-subsystem
...
Ports Sun Controller to Subsystem
2018-03-26 15:21:02 -07:00
931068c261
Merge pull request #8818 from Birdtalon/bluespace-cheese
...
Stops bluespace Cheese cheese
2018-03-26 14:11:00 -07:00
941b8c2389
recursive checking for putting objects inside slicable foods
2018-03-26 20:19:11 +01:00
2b6a6eb812
Ports Sun Controller to Subsystem
2018-03-25 19:23:26 -04:00
4b03a9abba
Second fix part 1
2018-03-24 16:41:14 -08:00
e6cc32d1b6
Merge pull request #8803 from shazbot194/More_Jackets
...
Updates Patch's Jacket icons and adds some more colors
2018-03-23 19:56:28 -07:00
a3183ee485
Upadates Patch's Jacket icons and adds some more colors
2018-03-23 17:42:59 -08:00
c4449fea39
Whoops
2018-03-22 15:41:33 -07:00
47f1e2c1e4
Address Fox's concerns
2018-03-22 15:39:41 -07:00
b14faa19c3
Merge remote-tracking branch 'upstream/master' into SMC
...
# Conflicts:
# code/__DEFINES/flags.dm
2018-03-22 15:35:12 -07:00
b1278de3d2
Merge pull request #8674 from uraniummeltdown/attacks
...
[READY] Attack Code Update
2018-03-22 11:55:53 -07:00
3b1783fe66
Second merge fix part one
2018-03-20 21:16:20 -08:00
d88a17a0f4
Fix runtimes, remove world init BS, UpdateTickRate()
2018-03-20 18:32:45 -07:00
8be770ed5d
Icon is named pill, not pills
2018-03-20 18:19:45 +01:00
53bb5eaf35
Vulp Hunger Hotfix
2018-03-19 19:37:35 -04:00
50f9d695a5
Merge pull request #8124 from Aurorablade/Dreams
...
Byond the wall of sleep
2018-03-19 13:42:00 -07:00
5a756ad3c9
Merge pull request #8708 from Birdtalon/nanocalcium
...
Nanocalcium: Bone repair drug.
2018-03-19 13:37:20 -07:00
6f5a666b1a
Merge pull request #8284 from Aurorablade/CultPassBug
...
Cult pass split: Bugs and runes
2018-03-19 13:28:36 -07:00
0a9a3c2b2b
More icons for the M90 ( #8738 )
2018-03-19 13:20:31 -07:00
de46e81793
Merge pull request #8775 from Birdtalon/take
...
Re-adds "Take" shortcut into admin help
2018-03-19 11:29:09 -07:00
cd6b8dfe45
Merge pull request #8566 from Aurorablade/BuffsVulpkanin
...
Tips the Scales
2018-03-19 11:27:35 -07:00
f7d96d8cfe
re-adds take shortcut into adminhelp
2018-03-19 11:27:21 +00:00
2e74bcd4d5
Why this no commit?
2018-03-19 02:05:37 -04:00
6aec682631
Diona needing water revert
...
Still have hair.
2018-03-19 02:05:16 -04:00
737a1575ff
NYAH
2018-03-19 01:44:48 -04:00
13212ee27c
Style Tweaks
2018-03-18 23:44:38 -04:00
59cbd79cc3
Fine, no typo
2018-03-13 22:31:27 -04:00
2a3dd305a9
Obscure Admin Related fixes
2018-03-13 22:22:51 -04:00
4a01ed097d
Merge pull request #8750 from PigeonLord/food
...
I changed the taste description of a few food items
2018-03-13 04:56:42 -07:00
28806f8fd5
Merge remote-tracking branch 'upstream/master' into terifluff
2018-03-13 05:20:20 +00:00
ae88de8669
Trying to solve the merge conflicts.
2018-03-13 04:50:25 +00:00
96fc4aba1c
Merge pull request #8671 from Aurorablade/PodFluff
...
Fluff Item: Decemviri
2018-03-12 15:58:39 -04:00
06fa27ac28
I changed the taste description of a few food items
2018-03-10 21:48:55 +01:00
fce0f75eb1
Merge pull request #8741 from shazbot194/Desolate_Fluff
...
Desolate's fluff name fix, no longer dancing fluff item
2018-03-07 22:47:49 -08:00
413118d1b4
Removes the dance machine
2018-03-07 15:30:40 -09:00
1ca410b91e
Fix various syntactic problems
2018-03-06 23:19:39 -08:00
79539cc0ea
Name and Description change
...
I forgot to ask Desolate what he wants, here is the fix for that
2018-03-06 22:18:17 -09:00
cc5d9bc31e
Adds in Desolate's dance machine button
2018-03-06 22:10:12 -09:00
add4852d3c
Remove purple rose properly
2018-03-06 04:46:17 -08:00
ff68c12b31
Removes purple hair flower pin
...
Removes the purple hair flower pin, as this is my fluff item.
@Tigercat2000 is moving the sprite to the correct folder then he's available.
:CL: Regen
rscdel: Removes the purple hair flower pin from loadout and general player access, because this is a fluff item.
/:CL:
2018-03-06 01:36:10 +01:00
9f4ac1f354
new queen sprite
2018-03-04 16:19:11 -08:00
27d3ccbe10
Allow silicons to properly use interface lock UI.
2018-03-05 11:48:40 +13:00
b09e3ae6f6
spacing, src/loc consistency in playsound, reverted the weapon hitsound change, removed silicon/damage_procs.dm as it's unrelated and wasn't even included in the .dme, fixed some typos
2018-03-05 02:07:31 +05:00
8f26d5b8b6
rename __DEFINES/mob.dm to __DEFINES/mobs.dm
...
make environment_smash into bitflags
add obj_damage for simple animals
make default max_integrity and obj_integrity INFINITY for non-defined objects, until we can move more objects to obj_integrity/take_damage() system
adds examining objects to roughly check damage
more obj_defense.dm procs
tables can be attacked with items, glass tables have a narsie_act()
fixes, changes to make it compile
2018-03-04 13:52:55 +05:00
Kyep