fa4fa09149
Merge pull request #5569 from Menshin/runtimes_roundsup
...
Alek2ander weekly runtimes fixing
2014-11-03 17:13:18 -08:00
fa8fcbba00
Merge pull request #5535 from Perakp/onlyOne
...
Highlander fix
2014-11-03 17:12:26 -08:00
6e11157661
Merge pull request #5520 from paprka/minerscrubs
...
Improves mining equipment prices, rebalances medipens
2014-11-03 17:12:02 -08:00
c12f67dae7
Merge pull request #5507 from tkdrg/xenonecrophilia
...
Facehuggers no longer violate the dead
2014-11-03 17:11:02 -08:00
85016d7f38
Merge pull request #5493 from tkdrg/pullingyourleg
...
Makes pull into a mob verb
2014-11-03 17:10:34 -08:00
cf7de8d24d
Merge pull request #5485 from MrPerson/emo_logging
...
Fixes slimes and borgs not emote logging
2014-11-03 17:08:38 -08:00
c794bdf797
Merge pull request #5432 from tkdrg/outoftheleftfield
...
Contaiment fields will now bounce off structures, machinery and mechs
2014-11-03 17:07:34 -08:00
0335c4adec
Makes ghostpointing invisible (thanks PsiOmegaDelta!)
2014-11-03 18:19:20 -03:00
2fefe79c1f
Merge pull request #5599 from phil235/CharScreenWindowFix
...
Fix the character setup window's size
2014-11-03 10:39:32 -06:00
5d7993eb75
Merge pull request #5602 from tkdrg/ihavenohandstopullyouwith
...
Slimes can no longer pull
2014-11-03 10:19:27 -06:00
9140006256
Fixes ghost pointing
2014-11-02 15:24:03 -03:00
cf5df74a27
Merge pull request #5540 from phil235/botRepairFix1
...
adding CoolDown to welding repair on bot/borg/mecha
2014-11-02 12:12:19 -06:00
7ebc4bb742
Merge remote-tracking branch 'upstream/master' into pullingyourleg
...
Conflicts:
code/modules/mob/mob.dm
2014-11-02 14:40:37 -03:00
51eae4c5a2
Merge pull request #5601 from phil235/ObjVerbCheckFix
...
Adding checks for stun, restrained to many object verbs.
2014-11-02 11:34:48 -06:00
13c155c5ad
Merge pull request #5546 from Perakp/saltAndPepper
...
Fixes sneaky pepper mill feeding
2014-11-02 09:50:30 -06:00
852d54df78
Merge pull request #5495 from phil235/ReagentSplashFix
...
You can no longer splash more than one turf/obj with a beaker/bucket by clicking quickly.
2014-11-02 09:33:48 -06:00
fc86499996
Merge pull request #5579 from wiox/P1
...
Throwing items in to disposal bins updates the icon
2014-11-02 09:31:09 -06:00
d35fbd3ec0
Merge pull request #5555 from rosenmann/food_reassigning
...
Reassigned snacks and recipies to more specific categories
2014-11-02 09:22:56 -06:00
47c2e9339b
Merge pull request #5567 from MrPerson/my_little_droney
...
Hopefully fixes that runtime where drones could wind up in nullspace.
2014-11-01 22:39:17 -05:00
7ab17964d6
Slimes can no longer pull.
2014-11-01 16:15:42 -03:00
128c9222e5
Adding checks for stun, restrained to many object verbs.
...
Fixing paper and supply manifest description upon examination.
Fixing being able to adjust jumpsuit while restrained.
Fixing one typo.
2014-11-01 19:18:01 +01:00
e00feb8f1f
Fix the character setup window's size
2014-11-01 16:18:23 +01:00
0bc683aa29
Merge pull request #5457 from GunHog/AI_Radio
...
Adds AI Integrated Radio
2014-11-01 03:44:44 +00:00
3d3521654f
Merge pull request #5497 from tkdrg/dingdongbannudesu
...
Assistant jobbans now ban people from using "Be assistant"
2014-11-01 03:42:50 +00:00
85c2b72cfe
Merge pull request #5482 from Menshin/maploader_rewrite
...
Maploader rewriting
2014-11-01 03:41:39 +00:00
f948d3038c
Merge pull request #5539 from phil235/Icecreamvat
...
Icecream vat fix
2014-10-31 18:44:39 -05:00
24b6e9c601
Merge pull request #5506 from hornygranny/OOPgularity2
...
makes the singularity's pulling OOP and insanely deadly
2014-10-31 23:13:11 +00:00
5fbb445168
Throwing items in to disposal bins updates the icon
...
This fixes #5504
2014-10-31 20:04:05 +00:00
5037e880d8
Fix the lag produces by oversized Pumpkings bounds interacting with space transitions.
...
Reduced the number of meteors to 10 waves of 3 over 40 seconds.
2014-10-31 19:48:55 +01:00
c8b5f99cf4
Merge pull request #5505 from phil235/AtkMsgFix1
...
/item/weapon with force 0 can no longer knock humans down
2014-10-31 10:02:19 -05:00
9bb612bd79
Merge pull request #5521 from xxalpha/horrorshoes
...
Bananium powered clown shoes
2014-10-31 09:52:56 -05:00
0cadefd855
Nothing to see here, continue with your planned spooking, citizens.
2014-10-31 21:52:10 +01:00
6176ee9f0f
conflicts fixing
2014-10-31 02:43:00 +01:00
cce46b39eb
Fixes runtimes related to clown_ore -> bananium changes ( fixes #5554 ).
...
Fixes runtimes related to security records (fixes #5552 ).
Changing the name in the security database now also change it in the general database.
2014-10-31 02:30:34 +01:00
9c95842adf
Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity2
...
Conflicts:
code/game/turfs/simulated/floor.dm
2014-10-30 17:26:25 -07:00
73b83ddef6
Merge pull request #5357 from tkdrg/attackoftheturfs
...
Floor refactor
2014-10-30 17:23:20 -07:00
0bb462e857
Fixes botcall conflicts, removes even more cruft and unused code
2014-10-30 20:36:30 -03:00
00cf1a4f50
Hopefully fixes that runtime where drones could wind up in nullspace.
2014-10-30 15:52:24 -07:00
9526b8804b
Merge remote-tracking branch 'upstream/master' into attackoftheturfs
2014-10-30 19:35:03 -03:00
4e7cb0eb01
Merge pull request #5530 from MrStonedOne/fukkinreallyerro
...
[MSO] Minor sql improvements.
2014-10-30 21:00:42 +01:00
c72de0c1db
Reassigned snacks and recipies to more specific categories
...
Also renamed some files.
It shouldn't change the gameplay. Yes, I have checked if I didn't delete
any snack or recipe.
2014-10-30 18:48:50 +01:00
985eb09333
Merge pull request #5508 from tkdrg/harvestallthethings
...
You can now only become a harvester when you can see Nar-sie
2014-10-30 12:13:35 -05:00
e2c4eebe9d
You can now only become a harvester when you can see Nar-sie
2014-10-30 13:24:43 -03:00
af78fee8fe
- fixes visible messages for feeding someone from condiments.
...
- lowercase condiment containers
2014-10-30 12:46:56 +02:00
3452f63f51
Fixes the singulo drifting through the shield gens and such, woops
2014-10-29 19:18:36 -07:00
afbeb03d9f
Fixes admin only vv related sql injection exploit in feedback reporting.
...
Noticed this while looking over my PR, by storing (and trusting) the escaped version, an admin could edit this in vv and do unspeakable things to the database
2014-10-29 18:19:47 -07:00
6f0666138a
Ensures spawned proc is never called if the client goes away
2014-10-29 18:02:21 -07:00
b8167969a9
Icecream vat overhaul. Fixes all the bugs it had.
...
BUG LIST:
Beaker can't be used to add reagents to vat, it goes directly inside the vat and the vat doesn't detect what's inside the beaker. Beaker is useless and its reagents (whatever they are) are used when making icecream.
Cannot put just a bit of reagents in the vat, it empties all the item's reagents or nothing.
Click icecream vat with a snack it will take all the reagents, the snack doesn't disappear until you try to eat it. "Vinny Saylor has emptied all of the egg into the icecream vat."
The vat doesn't work w/o power
Cant dispense cones if their total amount is bigger than 11.
take empty bottle stuff, click on vat, it still says that you empty the content in it.
scooping flavored icecream uses vanilla icecream as well..
2014-10-30 00:18:37 +01:00
a5ab00975b
Moves pulled() to /mob/living, lets ghosts point (only other ghosts can see the pointing)
2014-10-29 17:53:41 -03:00
5211f7ffbb
Tweaked
2014-10-29 20:44:58 +00:00
hornygranny
tkdrg
Cheridan
phil235
Remie Richards
William Wallace
Menshin
Miauw
Menshin
MrPerson
mrosiew
Perakp
MrStonedOne
xxalpha