Commit Graph

1157 Commits

Author SHA1 Message Date
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
phil235
3f57259c69 Merge pull request #9466 from Fayrik/TheNanoing
The Nanoing (Episode 2: The Fix Wars)
2015-06-22 14:24:20 +02:00
Cheridan
3da5cfd336 Merge pull request #10047 from Iamgoofball/patch-82
Removes Morphine Blob
2015-06-21 01:51:43 -05:00
Cheridan
a2948ba203 Merge pull request #9956 from Jordie0608/whocodesthecodemen
Various admin improvements
2015-06-20 00:53:30 -05:00
Iamgoofball
85975e3d53 Removes Morphine Blob
the last few times I tried to make this commit I fell asleep for 3 hours accidentally bumping the code
2015-06-19 22:06:19 -07: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
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
Remie Richards
eb68aa824e Merge pull request #9777 from KorPhaeron/timestop
Timestop now with webm
2015-06-14 22:27:17 +01:00
xxalpha
b2e84a0d3c Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip( 2015-06-14 20:11:40 +01: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
Razharas
9b22a123f4 Merge pull request #9891 from Iamgoofball/constructionjunctionwhatsyourfunction
Fixes cloners and portachems not working right with tier 4
2015-06-13 04:26:55 +03:00
Iamgoofball
302e97a138 Fixes cloners and portachems not working right with tier 4 2015-06-10 18:41:57 -07:00
kingofkosmos
7a952b9310 Merge branch 'master' of https://github.com/tgstation/-tg-station into blendershake
Conflicts:
	code/modules/food&drinks/kitchen machinery/gibber.dm
	code/modules/food&drinks/kitchen machinery/processor.dm
2015-06-10 20:48:22 +03:00
kingofkosmos
0933012ff6 Combined the two offset-lines into one line. 2015-06-10 19:43:45 +03:00
kingofkosmos
607ed1cbb8 Made all shakeys shake around themselves instead of shaking only to the right. Added shaking to blender's juicing process. Simplified the return-to-its-normal-spot line. 2015-06-10 19:43:44 +03:00
kingofkosmos
292c14eafb Made shaking faster. Added shaking to monkey recycler. Added juicer.ogg to the gibber. 2015-06-10 19:43:44 +03:00
kingofkosmos
06e98a1e86 Blender, food processor and gibber shaking when processing. 2015-06-10 19:43:44 +03:00
Iamgoofball
25c3832671 Adds trekchems to the Mediborgs. 2015-06-07 04:52:55 -07:00
Remie Richards
bca9c627ee Merge pull request #9767 from Iamgoofball/patch-71
Re-adds kekchems
2015-06-07 12:38:33 +01:00
phil235
ccd4137a9d Merge pull request #8974 from kingofkosmos/mopbucket
Mopping with just a bucket
2015-06-06 13:18:07 +02: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
Iamgoofball
0886e0e731 whoops 2015-06-03 18:06:05 -07:00
Iamgoofball
f11d042798 BY POPULAR REQUEST: Adds ODs to trekchems. 2015-06-03 17:56:36 -07:00
kingofkosmos
6b58fb55fa Unnecessary isprox-check removed. 2015-06-03 19:03:38 +03:00
Cheridan
a19f1801ff Merge pull request #9699 from KorPhaeron/turf
Changes how destroying/building turfs works
2015-06-02 23:15:42 -05:00
Iamgoofball
688ec672d0 Re-adds trekchems
Wanted to save this for #10000, but eh, too long of a wait.

requested by literally everyone ever

no recipes atm while I find ones that don't clash/rewrite some recipes
2015-06-02 17:42:53 -07:00
Firecage
f79e0fc1aa Updates more paths, for example obj/stuff to /obj/stuff 2015-05-31 17:48:33 +02:00
Firecage
84e8690ec6 merge conflict fix 2015-05-31 02:45:46 +02:00
Firecage
3a826fe13c Changes alot of datum/ to /datum/ 2015-05-31 02:40:54 +02:00
KorPhaeron
97990c94cc Changes how destroying turfs works
Turfs now have a baseturf var which determines what is "under" every
turf. The default is space.

Actions that previously did changeturf(/turf/space) (like bombs or RCD
deconstruction) now do changeturf(baseturf). Functionally the same for
the station, but allows special turf types that don't break to space
(such as planet tiles).

Right now the asteroid tiles are the only thing with a baseturf other
than space (the baseturf is an asteroid tile).

Baseturf is tracked when new things are built, so building a floor and
then a wall on the asteroid tile, and then bombing that wall will return
it to an asteroid tile, not space.

Allows building on asteroid tiles now that doing so wont randomly make
holes to space. Time for giant mining forts.

I should have done this years ago for away missions.

Also added myself to admins.txt
2015-05-29 18:43:34 -05:00
Cheridan
cbb91c601f Merge pull request #9616 from Jordie0608/ifhuamnityexpandstoanothersolarsystemwewillhavetorenamesunglasses
Bugfix goes Forth+1
2015-05-24 23:39:40 -05:00
Cheridan
ad8750eeb7 Merge pull request #9615 from phil235/RuntimesFixes
Runtime fixes and stuff.
2015-05-24 19:40:53 -05:00
Cheridan
f5c0addf40 Merge pull request #9606 from phil235/FixAddReagentRuntime
Fixes runtime division by zero in add reagent proc
2015-05-24 19:17:41 -05:00
phil235
554760e5f2 Merge pull request #9512 from xxalpha/itsakindofmagic
A second handful of fixes.
2015-05-23 16:52:51 +02:00
Jordie0608
fd10bfb9ab afk check for mutiny and lockers dont count as fleeing in rev/gang 2015-05-24 00:05:52 +10:00
phil235
ec6e318343 Fixes extinguisher (w/safety off) spraying water when placed on a table.
Fixes runtime when putting beaker in autolathe.
Fixes spray can empty message appearing when placing it on a table.
Fixes experimentor manual not having a title.
Fixes runtime with engine goggles updating nearby objects visibility.
Fixes runtime when looking at picture from the AI camera.
Updating the 'can_be_placed_into' list for items so their afterattack don't do anything when placing them in experimentor, autolathe, destructive analyzer.
Fixes soap starting to clean the table when placed on it.
Fixes drinking glasses having capitalized names.
2015-05-23 16:03:48 +02:00
Jordie0608
68eda1787b fixes cells corrupt()ing maxcharge, mime spells as borg and condi botles not allowing naming 2015-05-23 19:56:03 +10:00
phil235
5392a7faac Fixes runtime division by zero in add reagent proc when the amount argument is zero. It will now immediately return. 2015-05-23 01:36:07 +02:00
kingofkosmos
9bfe79b760 Everything under one bucket/attackby 2015-05-22 15:48:09 +03:00
xxalpha
972b488c8c Tweaked checks for borg beakers. 2015-05-21 19:39:48 +01:00
phil235
37abaffb50 Merge pull request #9431 from Incoming5643/wizard_fizard
Blacklists a few races to make spontanious race changes suck a little less
2015-05-21 15:52:48 +02:00
phil235
400d79655a Merge pull request #9526 from Jordie0608/bugsarethemotheroffeatures
Various more bugfixes
2015-05-21 15:45:18 +02:00
Swag McYolosteinen
b6ec3d1036 Merge pull request #9452 from Cheridan/thickmaterial
Tangential THICKMATERIAL-related fixes
2015-05-20 16:13:41 +02:00
Jordie0608
8329b10890 Merge branch 'master' of https://github.com/tgstation/-tg-station into bugsarethemotheroffeatures 2015-05-20 01:16:16 +10:00
Iamgoofball
da63a8acc6 Fixes some med bugs too 2015-05-16 13:07:30 -07:00
Iamgoofball
479f38fb61 Fixes a few chems having incorrect sleep values
phil forgot to change some of these when doing 1tick
2015-05-16 13:04:25 -07:00
Alek2ander
2e44f37797 Fixes grenade bullshit 2015-05-16 21:53:04 +03:00