9323c35a51
fixed disastrous and shameful failure
2014-02-13 19:16:53 -08:00
e0d0cedf36
passed over everything with throwforce
2014-02-13 18:06:50 -08:00
04aeb15af7
Rebalanced strange throwforces
2014-02-13 17:47:25 -08:00
a72eb90fdb
reduced a bit the damage from syndicate cards
2014-02-13 18:13:18 -03:00
e529a1ae84
small fix for an runtime related to ion trails (that smoke coming out from your jetpack when you move)
2014-02-13 18:08:41 -03:00
9b8656247c
u_equip is now called unEquip PANIC
2014-02-13 20:58:33 +01:00
cf4f6dcef2
Reduced number of possible chicks from a chicken crate
2014-02-13 19:20:14 +00:00
b8b57ff4f1
Replaced canremove with NODROP.
2014-02-13 19:52:46 +01:00
d042e2d183
Merge pull request #2754 from hornygranny/jetpack
...
Fixes #2720 jetpack storage assemblies
2014-02-13 12:01:05 -06:00
698debad08
Cleans up the trash.dm
2014-02-13 10:35:02 -05:00
7ae97bd4f6
Adds corresponding icons to cyborg thermal goggles, cyborg meson goggles, cyborg medical HUD and cyborg security HUD.
...
Fixes issue #2635
2014-02-13 15:37:55 +01:00
39e67ae092
Jay Owen demands that this pull be merged.
...
Crush a can for Jay Owen.
He has leukemia, please crush a can for Jay Owen.
His only wish is to see a can crushed live in our game.
Sprites by Nienhaus
2014-02-12 21:30:44 -05:00
e602febd40
Merge pull request #2713 from Tenebrosity/the-lit-the-lit-the-lit-the-lit-the-lit
...
Fixes misc grammar issues
2014-02-12 15:17:17 -08:00
9f46d5d8f7
Accounted for ridiculous edge case
2014-02-12 14:33:27 -08:00
46f8911f45
transfer valves now dynamically update their w_class based on attached tanks
2014-02-12 14:23:34 -08:00
8c7ef19be6
Replaced before_take_item() and drop_from_inventory() with u_equip
2014-02-12 19:51:37 +01:00
d47a9a4010
Fixes https://github.com/tgstation/-tg-station/issues/2720
2014-02-12 10:48:49 -08:00
7d4b9ac173
Asteroid Overhaul - Added explosions activating Gibtonite, revised ore redemption and equipment locker code, added warning signs to the western asteroid, tweaked mob spawning a little
2014-02-11 15:21:38 -08:00
5efa91f31e
Revert "Merge pull request #2479 from KazeEspada/nukeops"
...
This reverts commit c4c88036f87893b99e37
2014-02-11 14:44:38 -06:00
ad8568b8c5
Cleans up if checks in stack examine()
2014-02-10 19:55:37 +13:00
f70c8d29d9
Fixes misc grammar issues
2014-02-10 19:46:33 +13:00
892ffd3879
Merge branch 'master' of https://github.com/tgstation/-tg-station into asteroid_overhaul
2014-02-09 22:37:20 -08:00
c07d8c23dc
Merge pull request #2645 from tkdrg/ultrahardelitebugfix
...
Bugfix for #2627
2014-02-09 23:01:14 -06:00
bf17c3328e
Asteroid Overhaul v1.0
...
Mining Equipment Locker and associated items
Asteroid map rework
Mining Mob rebalancing
Minor fixes
2014-02-09 19:51:05 -08:00
e1a0f96846
Merge branch 'master' of https://github.com/tgstation/-tg-station into bananfix
...
Conflicts:
code/game/objects/items/weapons/clown_items.dm
2014-02-09 16:39:50 +13:00
6245d00a4d
Now with 100% more procs!
2014-02-08 18:22:56 -03:00
c43ba64484
Merge branch 'master' of https://github.com/tkdrg/-tg-station into ultrahardelitebugfix
...
Conflicts:
code/game/objects/items/weapons/storage/storage.dm
2014-02-08 17:50:31 -03:00
c316ff3365
Nitpick, ho!
2014-02-08 14:58:51 -03:00
c4c88036f8
Merge pull request #2479 from KazeEspada/nukeops
...
Nuke op overhaul: part 1, the renaming. [MAP][NEEDS PLAY TESTING]
2014-02-08 09:52:20 -08:00
0efd94884e
Merge pull request #2658 from Rockdtben/refactorMineralDoor
...
Refactored Close() and Open()
2014-02-08 04:32:42 -08:00
4ea05add26
Merge pull request #2649 from YotaXP/lighting-squared
...
Reduced the potency of carrying multiple light sources.
2014-02-08 04:13:57 -08:00
b19084569d
Merge pull request #2624 from adrix89/Fixes
...
Fixes
2014-02-08 04:03:50 -08:00
0aed48193c
Merge pull request #2626 from adrix89/slip_rework2
...
Slip rework the second encounter
2014-02-07 12:24:08 -08:00
26d4625ee7
Merge pull request #2488 from Razharas/OkLetsTryThis
...
Machines overhaul 2: MERGE LIKE SANIC
2014-02-07 13:06:48 +00:00
62ede5d1ae
Merging the Asteroid Map overhaul and Mining Equipment/Locker into one pull, added Mining Scanner, changed mesons
...
Tweaks on how caves are spawned and how mobs are spawned on the asteroid
2014-02-07 00:18:45 -08:00
bc733a83a4
Merge pull request #2650 from Giacom/master
...
MiniStation Update
2014-02-06 20:14:25 +00:00
c0aa3b56bb
Merge branch 'master' of https://github.com/tgstation/-tg-station into SayYiffYiffIfYouAreMachineFucker
...
Conflicts:
code/game/machinery/Sleeper.dm
code/game/machinery/computer/aifixer.dm
code/modules/hydroponics/biogenerator.dm
code/modules/power/apc.dm
code/modules/research/server.dm
icons/obj/stationobjs.dmi
Yeah nah time to merge this shit behore resolving conflicts will take more than 2 hours
2014-02-06 22:05:39 +04:00
5e05401541
properly fix rune cleaning
2014-02-06 17:35:48 +02:00
02cf28a4f1
missed a rune check
2014-02-06 17:13:01 +02:00
dfa1c8c363
Fine! removed ability to clean up runes
2014-02-06 09:12:32 +02:00
d5ccdb6ef1
fixes resin doors
2014-02-05 22:44:31 -06:00
d2e5c3a51b
Inserting lights into containers should no longer dim other lights.
2014-02-05 23:05:29 -05:00
216026ae82
Refactored Close() and Open()
2014-02-05 19:00:35 -06:00
6f202788ea
Fixes #2396 and #2395
...
- Banana peels are now grown weapons
- Banana peel slip duration is now based on their potency
- Clown spawns with a 50 potency banana, which is both regular sized and
produces a skin that's nice and slippery~
- Fixes nettle and deathnettle inhands not disappearing upon use
- Makes nettle and deathnettles use the hitsound variable instead of the
playsound proc directly. Now their hitsounds will scale in volume based
on damage done.
- Makes the banana mortar shoot potency 65 banana peels. Because
otherwise it'd shoot laughably tiny and short in slip duration potency
-1 ones.
- Moves corncobs to be grown weapons and updates their paths. Now their
size will scale based on the size of the corn that spawned them.
- Updates banan paths :)
2014-02-06 13:47:39 +13:00
6a9a7896c6
Merge pull request #2380 from Aranclanos/MineralDoors
...
Mineral doors, small fixes.
2014-02-05 18:20:21 -06:00
7319456770
MiniStation Update
...
Fixes a runtime with the vent clogging event, which happens to MiniStation.
Lowered all vent requirements to 20.
Fixed transit tubes from breaking by reversing the pod direction twice.
Changed the icon state name of the terminators so that they had density.
Transit tubes will now reset the view of the mob exiting.
2014-02-05 22:04:58 +00:00
6db2c59772
Reduced the potency of carrying multiple light sources.
2014-02-05 16:54:46 -05:00
26afced91b
Merge pull request #2629 from Giacom/master
...
MiniStation Update
2014-02-05 18:38:03 +00:00
fd81304128
Merge pull request #2612 from Mercenaryblue/master
...
The LaserTag update: Part one
2014-02-05 18:31:08 +00:00
61a8a25e1a
Fixes #2627 and line endings (?).
2014-02-05 15:03:15 -03:00
Hornygranny
Aranclanos
Miauw
Fleure
Cheridan
Incoming
GarrusVakarian
MrPerson
Ergovisavi
Tenebrosity
Rockdtben
Tkdrg
Razharas
Razharas
adrix89
YotaXP
Giacomand