D3athrow
01d2471fc9
Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge
...
Conflicts:
code/ATMOSPHERICS/pipe/pipe_dispenser.dm
code/game/machinery/computer/HolodeckControl.dm
code/game/machinery/embedded_controller/embedded_controller_base.dm
code/modules/mining/money_bag.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/silicon/mommi/mommi.dm
code/modules/mob/living/simple_animal/friendly/farm_animals.dm
code/modules/research/destructive_analyzer.dm
code/modules/research/rdconsole.dm
code/modules/research/xenoarchaeology/machinery/analysis_base.dm
code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
2015-04-12 16:40:59 -05:00
D3athrow
9f2e2bb4e3
Update gitignore
2015-04-12 14:54:16 -05:00
D3athrow
0c8683f6a4
Fix theft objective never returning a success unless it had a specific area requirement.
2015-04-12 14:49:38 -05:00
D3athrow
b80390701e
Fix erroneous admin messages for people messing with the AAC when not a ghost.
2015-04-12 14:49:38 -05:00
d3athrow
977f858548
Merge pull request #3865 from NigglyWiggly/skub-and-other-nonsense
...
More toys for the Gashapon
2015-04-12 14:41:52 -05:00
d3athrow
093bc457b9
Merge pull request #3861 from eswordthecat/Bleeding-Edge
...
Moved mime and clown rename code.
2015-04-12 14:41:44 -05:00
d3athrow
48f5d22f1d
Merge pull request #3860 from Arthurdentist/shoesnatch
...
Shoe Snatching Charm
2015-04-12 14:41:18 -05:00
d3athrow
0bda8ba351
Merge pull request #3876 from ComicIronic/MoMMIDrop
...
drop_item and click code.
2015-04-12 14:12:55 -05:00
ComicIronic
f8266a9d13
Merge pull request #3882 from DeityLink/Bomberman2
...
[HOTFIX] removing a "world << " debug message that I forgot in there
2015-04-12 18:08:04 +01:00
DeityLink
ed1f5bbe5e
hotfix
2015-04-12 19:05:41 +02:00
ComicIronic
c6a0ff6cdd
Readd silicon behaviour.
2015-04-12 11:38:54 +01:00
ComicIronic
744b5a01a6
Fix DME.
2015-04-12 11:35:38 +01:00
D3athrow
b7081790c4
i'm lazy but heres cryo thing.
2015-04-12 02:23:45 -05:00
ComicIronic
d0e9eedd25
drop_item and click code.
...
drop_item now has a first arg, which is the item to drop.
Hand processing now uses drop_item properly, which fixes #3874 , #3796 .
Also fixes #3486 .
2015-04-12 00:56:43 +01:00
NigglyWiggly
dfa8b6c9e3
Added stuffed animal versions of pets
...
Runtime, Lamarr, Poly, and Punpun, as well as a space bear and carp
2015-04-11 10:56:30 -04:00
Arthurdentist
a421304422
removed r
...
rip
2015-04-11 13:47:10 +03:00
Arthurdentist
6dbe610cdd
spelling
2015-04-11 13:37:28 +03:00
D3athrow
1e25ea379f
yes
2015-04-11 02:27:32 -05:00
D3athrow
f8ab04280c
remove delay on adding materials to the fab
2015-04-11 00:00:25 -05:00
NigglyWiggly
ac1fdfba9f
More toys for the Gashapon
...
Added more toys for the Gashapon machine, and gave it a description that
should actually be helpful, because most people don't think to shove
coins in a machine in exchange for a prize
2015-04-11 00:25:19 -04:00
eswordthecat
e02ff8adf4
original
2015-04-11 08:15:14 +08:00
Arthurdentist
8137513dc1
changelog
2015-04-11 02:54:25 +03:00
D3athrow
bba111625f
Fix tile painter producing infinite metal and glass with the recycler.
2015-04-10 18:37:39 -05:00
D3athrow
711c64fed2
I'm a dumb, south is better
2015-04-10 17:45:41 -05:00
D3athrow
c109038928
Fix occurrences of bad directionals in the maps.
...
dir = 0 -> dir = 1 (reverted from commit 5a3a3231cc
2015-04-10 17:45:30 -05:00
D3athrow
5a3a3231cc
Fix occurrences of bad directionals in the maps.
...
dir = 0 -> dir = 1
2015-04-10 17:41:49 -05:00
D3athrow
9e0d31a1a3
compile fix
2015-04-10 16:00:35 -05:00
D3athrow
f182f697c2
fix them stupid hairs
2015-04-10 15:59:40 -05:00
D3athrow
c3d0096c52
Fix lockboxes not showing (un)lockers
2015-04-10 15:52:10 -05:00
D3athrow
04fec841d9
yup
2015-04-10 15:08:29 -05:00
eswordthecat
4451f178e0
Moved mime and clown rename code.
2015-04-11 04:06:30 +08:00
D3athrow
4046561982
map renders link based on configuration option.
2015-04-10 15:02:05 -05:00
Arthurdentist
42d3a56207
Final touches
2015-04-10 21:31:16 +03:00
Arthurdentist
b7476e36ab
fix
2015-04-10 18:59:05 +03:00
D3athrow
727248ad60
make watchdog compile
2015-04-10 10:12:24 -05:00
D3athrow
77e79d931f
Update with proper url
2015-04-10 10:05:23 -05:00
d3athrow
27ca8a9576
Merge pull request #3851 from eswordthecat/wonk
...
Use the new recursive contents checker at steal items objective
2015-04-10 09:58:43 -05:00
Arthurdentist
0e7bde1f7e
Shoe Snatching Charm
...
Might need more work but it actually works
2015-04-10 12:18:45 +03:00
D3athrow
5610615fb3
ingame framework for vgws notes.
2015-04-09 22:53:16 -05:00
D3athrow
ddb5133241
Update header with proper test server link.
2015-04-09 14:56:27 -05:00
D3athrow
257a53de0d
should speed up startup.
2015-04-09 14:54:55 -05:00
ririchiyo
cf6ffb6dc3
Merge pull request #3840 from DeityLink/Bomberman
...
Bomberman update Part 1
2015-04-09 15:44:05 -04:00
eswordthecat
052004a3d1
Use the new recursive contents checker at steal items objective
2015-04-10 02:45:04 +08:00
d3athrow
89a26df5dd
Merge pull request #3847 from PsiOmegaDelta/MagicNullreferenceException
...
Fixes a null reference runtime that occurs if a wizard elects to reset spells.
2015-04-09 13:34:17 -05:00
d3athrow
86707ab1ed
Merge pull request #3827 from PJB3005/Randy-Random
...
Ports the procedural map generator from /tg/.
2015-04-09 13:34:10 -05:00
d3athrow
1e0123aedb
Merge pull request #3822 from NigglyWiggly/Gashapon!
...
Gashapon Machine
2015-04-09 13:34:04 -05:00
d3athrow
1d3677c54d
Merge pull request #3335 from Kurfursten/faxprayersounds
...
Adds sounds to faxes and Prayer. Different sounds.
2015-04-09 13:33:37 -05:00
D3athrow
3ad70446b9
readd access requirements on lockboxes that were missing it.
2015-04-09 12:43:07 -05:00
PsiOmega
6649db8b70
Fixes a null reference runtime that occurs if a wizard elects to re-remember spells.
...
Caused by spell_list and other lists now containing null elements after spells were deleted.
This should ensure that the screen spell GUI doesn't break permanently.
2015-04-09 14:41:48 +02:00
NigglyWiggly
af64c4ab93
non centered icons tickle my autism
2015-04-08 21:11:54 -04:00
