cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-16 12:07:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,764 Commits 61 Branches 14 Tags
643de0c922473f9ee721be207a024676121294de
Commit Graph

253 Commits

Author SHA1 Message Date
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
MrPerson
a23dbe2357 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor 
Conflicts:
	code/game/objects/items/devices/radio/radio.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/tanks/tank_types.dm
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/events/ninja.dm
	code/modules/power/cell.dm
	code/modules/power/port_gen.dm
	code/modules/reagents/reagent_dispenser.dm
 2014-08-29 04:21:15 -07:00
Alex
cec103fa21 Merge pull request #4454 from Ikarrus/plasteel 
Ore Redemption Machine can now Smelt Plasteel
 2014-08-24 13:05:12 +01:00
Firecage
dac8669166 Span classes for files in the following module folders: assembly, client, detectivework, events, hydroponics, mining, paperwork 2014-08-23 10:13:21 +02:00
MrPerson
13b03a6d43 Hopefully final pass of object -> mob examine switch 2014-08-20 07:07:30 -07:00
MrPerson
d0c97aae72 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor 
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/game/gamemodes/cult/ritual.dm
	code/game/gamemodes/nuclear/pinpointer.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/status_display.dm
	code/game/objects/effects/decals/crayon.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/airlock_painter.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/storage/secure.dm
	code/game/objects/items/weapons/tanks/tank_types.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/mousetrap.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/mob/living/carbon/slime/examine.dm
	code/modules/power/cable.dm
	code/modules/reagents/grenade_launcher.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/recycling/sortingmachinery.dm

Thanks Firecage, this is all your fault
 2014-08-20 05:54:20 -07:00
Alex
196f861efb Merge pull request #4441 from Ikarrus/brigtimer_notice 
Brig cells and Labor Shuttle will notify SecHUDs on release of a prisoner
 2014-08-19 10:32:50 +01:00
ikarrus
6444ae871b -Sechuds are notified when a prisoner has met his quota and moved the shuttle back on station. This is to let security know that there are minerals available, and that they should pick up the filled prisoner ID from the console 
-Shuttle points console will no longer open the release door while the shuttle is still on the labor camp dock. This is to prevent players from being trapped on the bottom half of the shuttle, as they're unable to reach the console again to move the shuttle
-Added a points checking machine on the labor camp to raise awareness that there usually IS a quota that will release you when met
 2014-08-16 15:16:56 -06:00
ikarrus
7a988c6497 Removing a premature return 2014-08-16 10:09:37 -06:00
ikarrus
c118f8a3ce Ore Redemption Machine can now Smelt Plasteel 
We've been seeing plasteel production plummet to basically zero simply because the only way to do it was via the production line that:
A) Is sealed off with wooden barriers and
B) Does not give any point rewards
 2014-08-15 19:25:50 -06:00
Alex
74c22755be Merge pull request #4365 from paprka/fingerlessgloves 
Adds fingerless gloves, other glove related changes
 2014-08-15 08:03:37 +01:00
Swag McYolosteinen
681990a835 Merge pull request #4364 from scoopscoop/sciencemineralnotice 
Ore redemption machine mineral availability notice
 2014-08-12 22:22:36 +02:00
scoopscoop
b14535344b Rewrote request console code to use a proc when generating a message on a target console 
Redemption machine now sends a message to chemistry, too.
 2014-08-12 13:56:02 +03:00
Alex
d5e578c6aa Merge pull request #4356 from paprka/minerals 
Asteroid mineral turfs rates and rescaling
 2014-08-11 14:03:11 +01:00
scoopscoop
9d47d2c98e Now uses a proc that generates messages on target console 
Basically gutted topic code.
 2014-08-07 18:38:09 +03:00
paprka
3b00fa9cfa cargonia strong! 2014-08-07 05:51:27 -07:00
scoopscoop
98739e8510 This sounds better 2014-08-07 15:12:17 +03:00
paprka
6770f6fdda second rates 2014-08-07 00:02:03 -07:00