Remie Richards
f5f833ecbb
Merge pull request #9971 from KorPhaeron/newfloors
...
New Bluespace/Sepia slime reactions, new var for turfs
2015-06-23 03:43:28 +01:00
Razharas
e6b738734a
Merge pull request #8876 from xxalpha/fixfixfix
...
Cyber Implants + (Pt.2)
2015-06-21 22:12:17 +03:00
Cheridan
a2948ba203
Merge pull request #9956 from Jordie0608/whocodesthecodemen
...
Various admin improvements
2015-06-20 00:53:30 -05:00
phil235
e6dcabf245
Merge pull request #9960 from xxalpha/bass
...
Put drop_item() calls inside ifs. Replaced some drop_item() with unEq…
2015-06-18 15:50:35 +02:00
phil235
98c158f958
Merge pull request #9845 from AnturK/buttsender
...
Adds PDA-Message Photo Attachment
2015-06-17 20:36:52 +02:00
phil235
9a1c1ae7af
Merge pull request #9967 from Jordie0608/figurediwouldvemissedsome
...
Fixes computer icon errors
2015-06-16 11:30:44 +02:00
Jordie0608
0bf6f09969
Merge branch 'master' of https://github.com/tgstation/-tg-station into whocodesthecodemen
...
Conflicts:
code/modules/admin/verbs/pray.dm
2015-06-16 17:24:20 +10:00
phil235
ae8c69f9a7
Merge pull request #9955 from kingofkosmos/spanspaceremoval
...
Unnecessary space removal from spans and messages
2015-06-15 18:20:04 +02:00
KorPhaeron
99735ea50d
New floors from xenobio/new var for turfs
...
Turfs now have a slowdown var that will determine how fast mobs move on
it.
Bluespace slimes can now create bluespace floor tiles which give -1
slowdown using blood
Sepia slimes can now create sepia floor tiles which give 2 slowdown
using blood
Camera and film reactions merged into a single water reaction
Bluespace crystal reaction moved to plasma
2015-06-15 01:33:00 -05:00
Jordie0608
7279c504c2
fixes server console icon
2015-06-15 14:42:47 +10:00
Cheridan
50686d2200
Merge pull request #9966 from KorPhaeron/timestop
...
Added new timestop sound from Cuboos
2015-06-14 19:45:17 -05:00
KorPhaeron
6bbc2141ff
Added new timestop sound from Cuboos
...
ZA WARUDO
2015-06-14 19:26:03 -05:00
Remie Richards
eb68aa824e
Merge pull request #9777 from KorPhaeron/timestop
...
Timestop now with webm
2015-06-14 22:27:17 +01:00
KorPhaeron
2e17e01b5f
New icon from Remi
2015-06-14 16:18:51 -05:00
xxalpha
b2e84a0d3c
Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(
2015-06-14 20:11:40 +01:00
Cheridan
565e4dda5a
Merge pull request #9931 from Jordie0608/tfwyougetsocarriedawayyoudontevenachievewhatyousetoutforandhavetomakeasecondprforit
...
Overlays for computers
2015-06-14 10:25:27 -05:00
Jordie0608
a67de221cc
JMP replaced with FLW, fixes and adds a bunch of key_name checks in adminlogging
2015-06-14 23:37:35 +10:00
kingofkosmos
c8d79e7034
Removed unnecessary spaces in these situations:
...
"span class = '" changed to "span class='"
"'> " changed to "'>"
2015-06-14 12:13:19 +03:00
Jordie0608
5ef93b2225
overlays for computers
2015-06-13 20:07:48 +10:00
Iamgoofball
a58cebbcce
fixes problems
2015-06-10 17:33:35 -07:00
Iamgoofball
f992eb1af0
Adds feedback gathering for a hell of a lot more things.
2015-06-09 21:52:46 -07:00
Razharas
47a02231f1
Merge pull request #9813 from Iamgoofball/constructionjunctionwhatsyourfunction
...
Upgrade Update: Bluespace Boogaloo
2015-06-09 08:48:51 +03:00
Iamgoofball
81fcaa9344
PSHOOM
2015-06-08 20:38:50 -07:00
Iamgoofball
10c60a59b1
adds beam sprites @cheridan merge when???
2015-06-08 19:56:06 -07:00
Iamgoofball
b5fc2ca46b
committed balance ideas and NEW SPRITE FROM WJ
2015-06-08 19:01:43 -07:00
Iamgoofball
9919e6a0cf
INTRODUCING THE BLUESPACE RPED
2015-06-08 17:07:19 -07:00
AnturK
46a4d6fe8f
Adds PDA-Message Photo Attachment
2015-06-08 17:40:24 +02:00
Cheridan
29c2bb474d
Merge pull request #9804 from Firecage/Exwelder
...
Adds the experimental welder to R&D + adds some descriptions.
2015-06-07 21:23:45 -05:00
KorPhaeron
f70c6d91f4
Fixed indent
...
Those strange grey lines confused me I am a simple person
2015-06-07 10:49:34 -05:00
Iamgoofball
3c1a0dd0d5
SMARTFRIDGE, SEED EXTRACTOR, and MONKEY RECYCLER are now buildable. ORE REDEMPTION MACHINE can now be upgraded.
2015-06-06 12:47:11 -07:00
Iamgoofball
e1cfbdaed4
RECYCLER AND HOLOGRAPH PADS ARE BUILDABLE and bugfixes
2015-06-06 01:35:01 -07:00
Iamgoofball
467cc12ae5
fixes
2015-06-06 00:33:02 -07:00
Iamgoofball
b65c7a36df
Upgrade Update: Bluespace Boogaloo
2015-06-05 23:56:09 -07:00
KorPhaeron
8617573668
Changed what Miauw and Remi told me to
...
Changed what Miauw and Remi told me to. Prettier code.
2015-06-05 16:36:40 -05:00
Firecage
89e2fbf0bb
Adds the experimental welder to R&D + adds some descriptions.
2015-06-05 20:43:21 +02:00
Cheridan
33cbb5ebd9
Merge pull request #9667 from GunHog/Cargo_Needs_Love
...
Adds Destination Tagger and Hand Labeler to Autolathe
2015-06-04 20:29:13 -05:00
KorPhaeron
f2abe13f51
New Sepia Slime Reaction
...
Adds a new sepia slime plasma reaction, timestop.
Freezes all mobs/projectiles in a 5x5 area for the duration, the creator
of the timestop is immune. Adds a new sepia slime reaction, timestop.
Activated with plasma, it
creates a bubble that freezes any mobs/projectiles in place for the
duration. The creator of the bubble is immune to its effects. Currently
a 5x5 area
When it ends, projectiles continue on their original path.
Moved camera and film to blood and water, respectively, if anyone even
cared about those.
Might need tweaking/balancing, but considering scientists can make bombs
and this takes longer, I don't think it'll be that bad (especially since
you can't melee people in the field)
2015-06-03 21:45:09 -05:00
Cheridan
2d998452db
Merge pull request #9715 from Firecage/datumspaths
...
Changes alot of datum/ to /datum/, also includes other path types such as /obj/
2015-06-02 23:04:51 -05:00
Firecage
f79e0fc1aa
Updates more paths, for example obj/stuff to /obj/stuff
2015-05-31 17:48:33 +02:00
Firecage
3a826fe13c
Changes alot of datum/ to /datum/
2015-05-31 02:40:54 +02:00
Razharas
6f1a705777
Fixes imprinter volume with beakers
...
Fixes imprinter volume with beakers
2015-05-30 17:23:39 +03:00
xxalpha
662af7174f
Merge remote-tracking branch 'upstream/master' into fixfixfix
...
Conflicts:
icons/obj/storage.dmi
2015-05-29 21:45:18 +01:00
GunHog
3b75f04cb7
Autolathe Destination Tagger and Hand Labeler
...
Adds Destination Tagger and Hand Labeler to autolathe.
2015-05-27 12:49:36 -05:00
xxalpha
f0351e1890
Tweaked uplink prices.
...
Undo X-ray requirement change.
2015-05-15 21:54:08 +01:00
Jordie0608
502d21a4da
Merge branch 'master' of https://github.com/tgstation/-tg-station into redefiningwhatitmeanstobeadefine
...
Conflicts:
tgstation.dme
2015-05-10 14:48:35 +10:00
Jordie0608
7369992d3d
further reorganization, elimination of old defines folder
2015-05-09 23:16:57 +10:00
GunHog
26df5b6c8e
Removes mining drill power mechanic.
...
- Removes the power mechanic from mining drills and the sonic
jackhammer.
- Fixes broken borg diamond drill upgrade.
2015-05-08 10:12:22 -05:00
KorPhaeron
91be614fa5
More changes
...
Based on Remie's suggestions
2015-05-05 21:49:49 -05:00
KorPhaeron
8b6b8887db
More slime stuff
...
Further tweaks slime mutation chances based on Crimson's feedback, makes
the code prettier based on Remie's feedback
2015-05-04 09:05:42 -05:00
KorPhaeron
e8d42244eb
Slime Mutation Changes +new reactions
...
Slime mutation chance starts at a flat 27%
Slime mutation chance is now hereditary, with the new baby slimes
inheriting the mutation chance of the parent (with a variation of -5 to
+5). This allows you to cultivate slimes that are more likely to mutate
over time rather than praying to the RNG forever.
Plasma no longer causes slimes to have a higher mutation chance, and
epinephrine no longer lowers mutation chance.
Red slime extract+plasma now gives a potion that increases mutation
chace
Blue slime extract+blood now gives a potion that lowers mutation chance.
The numbers might need tweaking if this makes xenobio too fast, but
right now it is often frustrating and slow. It is more reliable and
faster to build a mech than breed slimes given the current mutation
system.
2015-05-03 19:52:05 -05:00
