Krausus
3a5ef1baea
Makes disease square roots bottom out at 0
2017-02-23 05:43:21 -05:00
Crazylemon64
69ece3d12e
Makes autolathe hacking work again
2017-02-21 02:19:00 -08:00
Mark van Alphen
dea264faf2
Merge branch 'master' into stationgoals
2017-02-17 18:05:15 +01:00
Krausus
4754d6b4b3
Fixes some sounds not being cached properly
2017-02-17 02:37:26 -05:00
uraniummeltdown
af937077cd
cooldown 25->60 upgraded 10->20
2017-02-15 16:09:51 +04:00
uraniummeltdown
c661609076
Merge remote-tracking branch 'remotes/upstream/master' into rodform
...
# Conflicts:
# icons/mob/actions.dmi
2017-02-15 15:56:36 +04:00
Crazy Lemon
77a98d9a21
Merge pull request #6408 from KasparoVy/Fixing-VoxTailBug
...
Fixes Vox-tail Bug
2017-02-14 23:24:49 -08:00
KasparoVy
87aa937d8d
Fixes a bug w/ frankenstein limbs and Excises mob icobase/deform so the organs handle it.
...
Fixes a bug w/ the first commit where frankenstein limbs got converted to the owner's appearance (icobase/deform) if the owner HAS_ICON_SKIN_TONE.
2017-02-14 21:39:40 -05:00
Crazy Lemon
ebe28b3372
Merge pull request #6425 from Markolie/stackprogressbars
...
Progress bars now stack vertically
2017-02-14 13:27:47 -08:00
uraniummeltdown
60e61db55f
ports rod form wizard spell from tgstation
2017-02-14 21:05:08 +04:00
Fox McCloud
300751373d
Merge pull request #6280 from fludd12/Grey-Wingdings
...
Wingdings Revival^2
2017-02-13 06:26:56 -05:00
Markolie
c570ec4db2
Fix if() space
2017-02-13 00:02:33 +01:00
Markolie
40740d18ba
Code cleanup
2017-02-12 23:54:53 +01:00
Markolie
d0247fff2c
Progress bars now stack vertically. Also adds a bunch of lazy list helpers.
2017-02-12 23:51:50 +01:00
KasparoVy
6b50f16a12
Fixes Vox-tail Bug
...
When a new Vox spawns in, your tail won't suddenly break (become a
different colour).
Abstracts icobase/deform/tail from the species definitions a bit so
individual mobs can have a different icobase/deform/tail than other mobs
of the same species.
2017-02-12 02:28:15 -05:00
Markolie
4d857de148
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals
...
# Conflicts:
# icons/effects/beam.dmi
2017-02-11 18:26:06 +01:00
Markolie
3298f7edce
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
...
# Conflicts:
# icons/obj/objects.dmi
2017-02-08 19:25:47 +01:00
Crazy Lemon
2d77a0ab4d
Merge pull request #6357 from Fox-McCloud/var-edit-fixes
...
On Varedit Fixes
2017-02-07 20:01:32 -08:00
Crazy Lemon
d11dfa7a3b
Merge pull request #6343 from Fox-McCloud/reagent-tank-thingy
...
Refactors Reagent Tanks--Adds High Capacity Water Tank
2017-02-07 19:58:28 -08:00
Crazy Lemon
685250501b
Merge pull request #6345 from Fox-McCloud/monkey-cube-refactor
...
Monkey cube refactor
2017-02-07 19:53:58 -08:00
Markolie
835f68843a
Minor fixes, prevent ABSTRACT items from being summoned
2017-02-07 23:54:50 +01:00
Mark van Alphen
42cd3eec9a
Merge branch 'master' into stationgoals
2017-02-07 18:51:08 +01:00
Fox McCloud
93df42e792
Merge pull request #6342 from uraniummeltdown/clingmemory
...
Changeling Absorb Memory Fix
2017-02-07 09:21:32 -05:00
Fox McCloud
6b10c515b1
Merge pull request #6341 from uraniummeltdown/crates
...
Engineering and Science crates
2017-02-07 09:20:57 -05:00
Fox-McCloud
ad2468196e
On Varedit Fixes
2017-02-07 08:44:50 -05:00
Fox McCloud
fb926cb0d4
Merge pull request #6328 from uraniummeltdown/linglink
...
Hivemind Link
2017-02-06 07:26:20 -05:00
Markolie
f2497afd9d
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals
...
# Conflicts:
# _maps/map_files/cyberiad/z2.dmm
# code/__DEFINES/is_helpers.dm
# code/__DEFINES/misc.dm
# code/_globalvars/lists/objects.dm
# code/modules/mob/living/living_defines.dm
# icons/effects/beam.dmi
2017-02-05 20:12:51 +01:00
Fox-McCloud
846ce475b2
Refactors Reagent Tanks--Adds High Capacity Water Tank
2017-02-05 13:58:24 -05:00
uraniummeltdown
d87603054b
say_log for mobs, fixed changeling absorb memory, changelings can now see past 8 messages of absorbed victim
2017-02-05 22:00:17 +04:00
uraniummeltdown
6f774c8e1e
added engi+engisec, electric engi from TG and sci+scisec crates from /vg/
2017-02-05 19:22:07 +04:00
Fox-McCloud
390f6768b3
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-02-05 05:26:46 -05:00
Crazy Lemon
01c41cfb86
Merge pull request #6081 from Markolie/lavaland_megafauna
...
Ports Lavaland megafauna
2017-02-05 00:27:40 -08:00
uraniummeltdown
2620f4e365
adds hivemind link to changelings, allows them to give a victim in > neckgrab hivemind comms for 3 minutes
2017-02-04 17:45:22 +04:00
fludd12
fe9f547da6
Moves spans to mind
2017-02-03 22:05:16 -05:00
Brian McGillivray
23139987a0
Tweak: Mr Chang's vending machine now refillable
...
Changed the Mr Chang's vending machine to be able to be refiled with a
new Chinese vending refill canister crate that can be ordered by Cargo.
2017-02-02 15:49:27 +00:00
Fox-McCloud
78a2518135
Monkey cube refactor, pre-map
2017-01-31 20:44:52 -05:00
Markolie
b55394ace3
Fix resource identifiers
2017-01-31 17:45:46 +01:00
Markolie
ab4703623c
Review changes
2017-01-27 17:46:38 +01:00
Fox-McCloud
cd93a21a97
nymphs and fixes
2017-01-26 03:38:25 -05:00
Markolie
fcf8d1f7c4
Final touches to station goals
2017-01-25 16:14:40 +01:00
Markolie
14fd8ec3ec
Final station goal changes
2017-01-25 02:43:58 +01:00
Markolie
a06c997629
Add Station Goals
...
Still to-do:
* Remove old BSA computer.
* Add NanoUI interfaces for all goals.
* Test it.
2017-01-23 22:02:29 +01:00
Fox-McCloud
3e87bd3370
more adjustments and fixes
2017-01-23 05:56:17 -05:00
Fox-McCloud
5c828db250
fixes, comfrey, and aloe
2017-01-23 05:25:42 -05:00
Fox-McCloud
7007f6bbdf
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-23 01:01:09 -05:00
Fox-McCloud
104bfab759
sprite and code fixes
2017-01-22 23:25:56 -05:00
Markolie
d6276ae978
Tiger's comments
2017-01-22 19:15:26 +01:00
Fox-McCloud
706347fd84
even more work
2017-01-22 08:11:31 -05:00
Fox-McCloud
ea76990b7a
Botany Rework
2017-01-21 18:28:03 -05:00
Markolie
a50a3d59b9
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/__DEFINES/is_helpers.dm
# code/_globalvars/lists/objects.dm
# code/game/machinery/turrets.dm
# config/example/config.txt
# goon/browserassets/css/browserOutput.css
# icons/obj/library.dmi
# icons/turf/floors.dmi
2017-01-20 23:43:35 +01:00
