Jordie
4e1b27c08b
Merge pull request #9135 from Incoming5643/validsalid
...
Adds Antag Tokens!
2015-04-25 19:14:34 +10:00
Incoming
a5fc495a27
please don't tell anyone I forgot how to spell salad
2015-04-24 17:55:53 -04:00
kingofkosmos
761d31cea0
More visible.message span classes removed.
2015-04-24 21:24:21 +03:00
kingofkosmos
a7bd5f93e1
"You hear something" set to italics.
2015-04-24 21:06:16 +03:00
kingofkosmos
1d14471d00
Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark.
2015-04-24 20:50:50 +03:00
Incoming
6e25a57230
Adds Antag Tokens!
...
They're a novelty coin with a syndie helmet (valid) on one side and a salid (salid) on the other.
Found as a prize in arcade machines, Sec can also get one from their vendor as a premium item.
2015-04-23 19:08:38 -04:00
Jordie
1f9351c3fd
Merge pull request #8925 from xxalpha/ripped
...
Low pressure environment Ripley buff & Mecha Mining Scanner.
2015-04-22 17:49:57 +10:00
Jordie0608
26ca19e07d
Merge branch 'master' of https://github.com/tgstation/-tg-station into tfwyoubreakyourownfix
...
Conflicts:
code/modules/mining/mine_items.dm
2015-04-17 18:02:45 +10:00
xxalpha
a8b9fef6ba
Made a proc for mineral scanning.
2015-04-16 20:28:47 +01:00
Cheridan
bf6ae43aec
Merge pull request #8917 from phil235/BorgDrillFix
...
Fixes miner cyborg being able to eject their drill's cell.
2015-04-14 17:19:27 -05:00
phil235
ba772b3291
derp.
2015-04-13 16:34:49 +02:00
Jordie0608
8610d24a75
merges secure closet code into normal closets, fixes overlay bugs
2015-04-13 17:38:57 +10:00
phil235
b842c800a8
Fixes miner cyborg being able to eject their drill's cell.
2015-04-12 16:18:42 +02:00
Incoming
81da573b8d
adds speak emote to a lot of simple animals that lacked them
2015-04-10 18:44:51 -04:00
phil235
13baa6e3cb
Merge branch 'master' of https://github.com/tgstation/-tg-station into KineticAcceleratorNerf
...
Conflicts:
code/modules/projectiles/projectile/special.dm
2015-04-09 17:27:55 +02:00
Jordie0608
ad33641101
Merge branch 'master' of https://github.com/tgstation/-tg-station into howdoyouknowyourbestfriendisntsecretlyawizard
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
icons/obj/closet.dmi
2015-04-08 22:51:45 +10:00
Jordie0608
37277f66e7
pre-map compile
2015-04-08 15:40:41 +10:00
phil235
7df5998740
Nerfing plasma cutters, their damage and range is reduced in pressurised environment. Reduces drilling cost of all drills to make them appealing. Drill cells are now removed by clicking the drill, no more screwdriver needed. Resonator fields can no longer be stacked on each other. Switching from 5 to 3 seconds detonation on the resonator is now done by clicking it instead of screwdriving. Increasing building costs for plasma cutters. Removes mineral/screwdriver upgrades to resonator and kinetic accelerator. Plasma cutters can now only uses solid plasma.
2015-04-08 03:44:56 +02:00
kingofkosmos
2e4a8fcce8
Recieve --> receive grammarfix
...
Changes all "recieve"s in descriptions around the tgstation to "receive". Also energy katana description high priority fix.
Fixes #8576
Fixes #8504
2015-04-03 19:42:34 +03:00
Jordie
57e1274353
Merge pull request #8624 from Cheridan/day42_betsoff
...
Day Who-Knows: Bar Gambling Expansion!
2015-04-02 20:15:18 +11:00
Jordie0608
d2600d8ea2
whoops
2015-03-31 21:51:48 +11:00
Jordie0608
e70134a37a
made warning function not really dumb
2015-03-31 21:49:07 +11:00
Jordie0608
879659a3d1
cyborg drills use internal battery first + charging fix
2015-03-31 21:24:48 +11:00
ACCount12
f10d0df8cf
Merge remote-tracking branch 'origin/master' into mining
2015-03-31 18:31:12 +12:00
ACCount12
1c219f0ebe
A lot of stuff
2015-03-31 18:30:09 +12:00
Cheridan
884e9e3774
Day Who-Knows: Bar Gambling Expansion!
...
Space cash is stacks
Adds dealer table to map
2015-03-29 18:09:54 -05:00
pudl
69924a15be
plasma/ripley update
2015-03-25 18:06:26 -05:00
phil235
ffd711c26f
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
...
Conflicts:
code/modules/mob/living/carbon/life.dm
code/modules/mob/living/carbon/slime/slime.dm
code/modules/mob/living/simple_animal/friendly/corgi.dm
code/modules/mob/living/simple_animal/slime/say.dm
code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
2015-03-23 16:51:03 +01:00
phil235
98f9916317
Yet more work on slime procs and life subprocs.
2015-03-21 20:44:32 +01:00
dannno
8bb7b3b50f
MINE IS THE DRILL THAT WILL PIERCE THE HEAVENS
...
added meson gar glasses to mining vendor
made gar glasses names consistent
2015-03-20 14:45:39 -04:00
phil235
aecb365f84
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
...
Conflicts:
code/modules/mob/living/carbon/alien/life.dm
code/modules/mob/living/carbon/life.dm
code/modules/mob/living/carbon/slime/slime.dm
code/modules/mob/living/silicon/robot/life.dm
code/modules/mob/living/simple_animal/slime/life.dm
2015-03-20 19:32:16 +01:00
xxalpha
2e43283964
Fix runtime.
2015-03-16 00:44:10 +00:00
xxalpha
ca132952f9
Fixes the ore redemption machine outputting zero amount stacks.
2015-03-15 19:26:54 +00:00
phil235
7ba8af5222
Fixes steel cap bug. Steel cap now growns steel logs similar to wooden logs, you use the hatchet to get rods.
...
Reorganizes all flashing to use the same mob proc 'flash_eyes()' (welding tool use, flashbang, flashers, laserpointers, etc).
Fixes making sandstone not stacking the result sandstones on the floor.
Sandstone, grass tile and carpet tile now look for other incomplete stack on their creation location to try to put them all in one stack (exactly like wood planks).
Fix typos.
Remove banglet var from all flashbangs, making flashbangs from clusters behave exactly like the other ones.
Renames eyecheck()proc to check_eye_prot() and moves it to mob/living level, elso creates check_ear_prot() for checking ear protection.
2015-03-10 20:30:46 +01:00
phil235
282d0231e0
WIP moving carbon/life to living/life()
2015-03-08 16:22:41 +01:00
Jordie0608
a7e23d672a
Improves drill's handling of power
2015-03-05 17:12:12 +11:00
Remie Richards
b1ff6b7220
Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams
...
Conflicts:
code/game/turfs/simulated/floor/light_floor.dm
2015-02-24 22:16:53 +00:00
Remie Richards
5fc7af7fbf
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
...
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
paprka
54fec53ba2
changelog and compile fix
2015-02-14 19:40:11 -08:00
paprka
bca3242b3c
small nerf to resonators
2015-02-14 17:34:04 -08:00
paprka
066b2762d3
lots of crap
2015-02-14 17:25:45 -08:00
paprka
52bac40485
nerfs mining drill a little
2015-02-13 22:04:38 -08:00
paprka
85675e92b8
my good judgement gets the better of me
2015-02-13 21:50:00 -08:00
paprka
ab3ff729ce
some fixes
2015-02-13 21:44:04 -08:00
paprka
88760896ad
initial commit
2015-02-13 20:59:39 -08:00
GunHog
e20c6dd788
Drone Access get
...
DRONE POWAH
2015-02-06 22:17:36 -06:00
GunHog
20beb90adf
Lets Silicons use the Ore Redemption Machine
...
- Silicons can now use the Ore Redeemer.
Codernote: I removed the "istype(inserted_id)" checks for the release
and plasteel functions as they do not do anything to the ID inside
except the check_access() proc. That proc returns 0 if called when no ID
is inserted, so it can safely be removed from those two options.
2015-02-06 15:43:41 -06:00
Cheridan
8c893f6aca
Merge pull request #7065 from phil235/GibtoniteLogFix
...
Gibtonite log fix
2015-01-25 00:29:18 -06:00
phil235
6adce739b1
little fix
2015-01-24 14:13:28 +01:00
Firecage
8e93e028e4
Fixes ore redemption machine screwdrivering
2015-01-21 23:53:11 +02:00
