Razharas
c5209f2399
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
2014-11-27 15:30:37 +03:00
Razharas
41a43b0040
Quickfix
2014-11-27 15:30:24 +03:00
Razharas
ff456ebaf4
Unwinded most of shit
...
Meh
2014-11-19 21:36:45 +03:00
Razharas
b071a0167e
Made explosions work in a slightly different way
...
Yep
2014-11-18 16:22:41 +03:00
tkdrg
705a264dcf
Makes data huds passive.
2014-11-16 01:52:06 -03:00
Menshin
cdd5128d47
Removed hilarious but useless sleep() in closets/boxes New()
2014-11-10 01:59:32 +01:00
hornygranny
fa4fa09149
Merge pull request #5569 from Menshin/runtimes_roundsup
...
Alek2ander weekly runtimes fixing
2014-11-03 17:13:18 -08:00
hornygranny
6e11157661
Merge pull request #5520 from paprka/minerscrubs
...
Improves mining equipment prices, rebalances medipens
2014-11-03 17:12:02 -08:00
Menshin
6176ee9f0f
conflicts fixing
2014-10-31 02:43:00 +01:00
Menshin
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
tkdrg
9526b8804b
Merge remote-tracking branch 'upstream/master' into attackoftheturfs
2014-10-30 19:35:03 -03:00
paprka
1b91ab24ce
Improves mining equipment locker and rewards system, and buffs kinetic accelerator
2014-10-28 15:42:55 -07:00
scoopscoop
9d98640bc7
The supply shuttle, supply ordering, ore redemption and mining vendor consoles in cargo now use datum/browser/popups instead of user << browse so they don't look like random HTML pages.
2014-10-23 15:26:33 +03:00
tkdrg
a6cf62a9e0
Merge remote-tracking branch 'upstream/master' into attackoftheturfs
...
Conflicts:
code/game/mecha/equipment/tools/medical_tools.dm
2014-10-20 17:27:02 -03:00
Cheridan
455b526cc1
Merge pull request #5318 from phil235/MsgFix2
...
More messages fixed
2014-10-19 21:39:06 -05:00
tkdrg
cd5720b6a7
Floor refactor, try #1
2014-10-19 16:48:35 -03:00
phil235
9b9481d65c
Changes many span classes.
...
Replaces for(mob in oviewers) show_message() with visible_message() when possible.
Fixes the absolute pathing in Ninja code.
Fixes facehugger attack messages being bold red for third party (only the first leap message will stay bold red for third party, for better visibility)
Standardizes vomiting message
Fixes mech occupant not receiving any attack messages when the mech is attacked.
2014-10-18 16:00:38 +02:00
Cheridan
13b59d2d0e
Merge pull request #5165 from paprka/INGLEWOODINGLEINGLEWOOD
...
Expands medipens & mining
2014-10-16 08:44:36 -05:00
Cheridan
865391d6a1
Merge pull request #5233 from Jordie0608/stateoftheiconstates
...
[MAP] Fixes energy guns, coins, arrivals chairs and syndiebombs not having icons in map editor
2014-10-16 08:28:13 -05:00
Aranclanos
e6c533eb95
Merge pull request #5253 from phil235/SandstoneStackFix
...
You can no longer make stacks of grasstile/sandstone bigger than max amount
2014-10-15 10:46:58 -03:00
phil235
d85beb0d0a
Fixing sandstone stacking.
2014-10-14 21:56:36 +02:00
phil235
d66b0e61f0
Fixes the ability to make stacks of grasstile/sandstone larger than the max amount authorized.
...
Fixes an error in the amount of grasstiles produced.
Fixes some unnecessary capitalisation in mineral deposit names.
2014-10-14 21:22:08 +02:00
Jordie0608
93f46d186a
Fixes energy guns, coins and syndiebombs not having icons in map editor
2014-10-14 01:16:15 +11:00
Remie Richards
3566e235af
Merge pull request #5193 from phil235/OreBoxExFix
...
Fix for #5191
2014-10-13 11:49:41 +01:00
phil235
74db5df591
Adding an ex_act() proc to ore_box so the ores it contains aren't all deleted when the box is deleted by an explosion.
2014-10-11 15:42:29 +02:00
paprka
9a83100032
reduces price of stimpack and lepo medipens
2014-10-10 09:20:31 -07:00
paprka
b2ca9776fd
expands medipens
2014-10-09 18:01:35 -07:00
paprka
c52916ad01
M'LADY
2014-10-08 14:48:17 -07:00
hornygranny
02d8cf4115
Merge pull request #4994 from paprka/miningainteasy
...
Mining rebalancing
2014-10-08 14:44:35 -07:00
paprka
f92e08d6a8
revert borg nerf
2014-10-07 20:34:28 -07:00
Cheridan
f5b5ead3ef
Merge pull request #4516 from MrPerson/examinate_the_doctor
...
Change examine() from an atom verb to a mob verb
2014-10-05 23:37:34 -05:00
Cheridan
08be1b34eb
Revert "Changes a few green crosses to blue on sprites that I missed last time"
2014-10-04 19:22:10 -05:00
MrPerson
651c3e6db5
Merge to master - sole conflicting file was ninja.dm FUCK NINJAS
2014-10-04 01:45:39 -07:00
paprka
647d3b1ef6
price reduction
2014-09-30 11:54:40 -07:00
paprka
b64b1a6cc8
icon fix
2014-09-28 08:25:14 -07:00
paprka
63b531dff2
scanner for voucher
2014-09-27 17:08:12 -07:00
paprka
4fbe9730f6
Mining rebalancing
2014-09-27 17:04:56 -07:00
Swag McYolosteinen
f9e17faca3
Merge pull request #4889 from Jordie0608/orwecouldpathplasmasheetsasfire
...
Repaths clown ore to bananium
2014-09-24 16:58:23 +02:00
Remie Richards
4bcc59fefa
Merge pull request #4915 from Menshin/ore_machine_sheets_fix
...
Ore machine emptying stacks fix
2014-09-24 12:06:05 +01:00
Menshin
eb9936816e
Deconstructing or exploding an ore redemption machines would now eject content by proper stacks instead of one giant stack.
...
Fixes #4911 .
2014-09-20 23:21:36 +02:00
Cheridan
7a32582db9
Merge pull request #4745 from Perakp/miningScanner
...
Mining scanner scans automatically, similar to t-ray scanner.
2014-09-19 09:43:32 -05:00
Jordie0608
40e0a52283
Repaths clown ore to bananium
2014-09-19 21:26:50 +10:00
Perakp
4efdf2036c
Removes the message for when no ores were detected & slight re-organization.
2014-09-18 20:35:45 +03:00
Cheridan
f5bf1ddaa9
Merge pull request #4809 from RemieRichards/Drones
...
Ports Drones from NTstation + New Improvements/Features
2014-09-17 16:56:40 -05:00
Aranclanos
53f48fa599
Cleaned up the turf Entered() procs:
...
-Removed check for infrared beams. (it checked each time that anything moved)
-Removed 'movement_disabled' check, the verb is also completely removed.
For space Entered() turfs:
-Removed check for meteor
Now meteors and immovable rods will use the same proc to determinate their start and finish, while moving they'll check in which z level they are, deleting themselves if they leave it.
-Removed spawn() to move objects being pulled between z levels
Replaced the step() from mob pulling movement code and replaced them with Move()
For asteroid Entered turfs:
-Removed check for mining cyborgs, now it will be next to the janitor borg check to clean the floor.
Mecha code got a small clean, removing the Entered() calls from there.
2014-09-15 03:26:58 -03:00
Remie Richards
473bcd1858
Ports Drones from NTstation + New Improvements/Features
2014-09-13 15:02:57 +01:00
Perakp
1a6523cb93
Mining scanner now works with ripleys.
2014-09-12 14:46:31 +03:00
Perakp
3a3f703ed9
Mining scanner scans automatically, similar to t-ray scanner.
...
Cooldown increased for balance/ to not have the flashing ores be too annoying.
2014-09-08 15:00:37 +03:00
ikarrus
20e337f8c4
Labor Camp Quotas
...
- Caps labor camp quotas at 1000 points (the equivalent of 10 minutes in the brig)
- Adds a line explaining the conversion rate between points and minutes
- Removes erroneous information that claimed zero point quotass equalled to unlimited
2014-09-07 18:42:46 -06:00
Lo6a4evskiy
82f869c9a6
Updated to resolve conflicts
2014-09-06 13:34:43 +04:00
