Commit Graph

221 Commits

Author SHA1 Message Date
duncathan
5bfaff9879 adds tray goggles 2015-07-10 03:35:56 -06:00
Razharas
b9edcba234 Merge pull request #9796 from CorruptComputer/MergeConflictsSuck
[Merge Ready] "AsteroidStation rises from the dead, try two!"
2015-07-05 05:58:21 +03:00
Alexander P. Ulan Hernandez
ebc6041f9f Comitterydoo
Adds Xhuis' second shadowling fix, along with a slight rework and
expansion of the veil spell.
2015-06-29 03:58:03 -04:00
Orange Borg
77a77dd107 Jetpack speed changes [DNM]
being in zero grav now gives a -1 speedup (as if you had gottagofast)
being in zero grav with a jetpack gives -2 (gottagoreallyfast)

The gottagofast and gottagoreallyfast flags only apply in gravity situations now
2015-06-29 15:30:55 +12:00
CorruptComputer
6845b69e59 Ok lets try this again 2015-06-04 22:43:32 -05:00
Cheridan
842e3f3239 Merge pull request #9741 from palpatine213/SecHudEmag
Allows HUDs to be emagged with an emag as well as an EMP
2015-06-04 20:19:39 -05:00
palpatine213
a9d245ceb6 Adds self to Admins.txt 2015-06-01 16:15:49 -07: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
Jordie
0c08ffb95e Merge pull request #9183 from GoonOnMoon/ARG1
ARG Assault Rifle Addition
2015-04-28 23:49:33 +10:00
GoonOnMoon
d1b102361d Adds Nanotrasen's equivalent of the M90 assault rifle to the game: the ARG. Currently only obtainable with badminnery. Uses 5.56mm ammunition.
Added myself to admins.cfg as a coder.

Added new icons for the ARG.
2015-04-20 14:21:40 -05:00
Fayrik
84df0192f4 Buffs Deathsquads. 2015-04-18 00:06:17 +01:00
kingofkosmos
2393f6cc80 admins txt normalization 2015-04-03 19:51:49 +03: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
ACCount12
143259a7b4 The Coder's Ritual 2015-03-28 14:44:50 +12:00
Ahammer18
12a9607b80 Updated 2015-03-07 22:42:43 -06:00
TheVekter
ff65ec2018 Fixed "Chilli" -> "Chili" and "Coco" -> "Cocoa". Pray it passes Travis. 2015-02-06 05:22:53 -06:00
Lo6a4evskiy
bfd74684b4 Tweaks as noted, added myself to admins.txt 2015-01-24 16:14:44 +04:00
pudl
dd5c7db5ad in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.
12x syringe
10x styptic patch
10x silver sulf patch
4x charcoal bottle
4x epinephrine bottle
4x morphine bottle
4x diphen bottle
3x potassium iodide bottle
5x salglu bottle
3x atropine bottle
6x spaceacillin syringe
10x calomel syringe
10x salbu pill
10x mannitol pill
5x mutadone pill
4x health analyzer
2x crew monitor
CONTRABAND:
all of the same except with 3 bottles of toxin

the two types of wallmed have been combined into one wallmed, which contains all of the above except halved. in instances where the number was odd, the higher of the two numbers was taken.

medical closet has been stocked with a lot of new stuff.
2x beakers
2x droppers
1x medical belt
1x syringe box
1x toxin bottle
2x morphine bottles
3x epi bottles
3x charcoal bottles
1x rxglasses box

this, of course, 3 new pills and 3 new bottles in code so they could be in the nanomed.

gives genetics a bottle of mutadone pills on box and eff3 and puts a public bottle of epinephrine on the medbay desk. adds a single syringe to boxstation's medical storage.

medkits now have some new equipment.

normal
2x styptic patch
2x sulf patch
1x salicyclic pill
1x health analyzer

fire
4x silver sulf patches
1x health analyzer
1x epipen
1x salicyclic pill

toxin is unchanged

oxygen
4x salbu pills
2x epipen
1x health analyzer

all maps and z levels are updated for this.

renames styptic patch to brute patch and silver sulf patch to burn patch. renames charcoal bottle to antitoxin bottle

adds myself to admins.txt
2015-01-20 22:26:13 -06:00
dannno
5dc6f1449f when in hat form, bandanas can be added to head slot
fixed the admins.txt nonsense
2015-01-13 15:41:45 -05:00
dannno
3dc5a04038 Merge branch 'master' of https://github.com/tgstation/-tg-station into bandanno's
Conflicts:
	config/admins.txt
2015-01-12 15:55:51 -05:00
dannno
c827a6b118 changelag 2015-01-12 15:37:45 -05:00
dannno
c76072608a bamboliers 2015-01-07 20:28:16 -05:00
TZK13
bf5bddf0c7 Merge branch 'master' of https://github.com/tgstation/-tg-station into Socks
Conflicts:
	config/admins.txt
2015-01-03 07:07:03 -06:00
Boggart
ff17e083eb Fixes being unable to build doors over firelocks, blast doors and shutters.
As a result, any door with the sub_door variable set to 1 can have an airlock built over it.
Also fixes using a fireaxe to open unpowered poddoors and adds myself to the admins.txt.
2014-12-31 20:47:17 -07:00
TZK13
c0bfd10e49 Fixing merge conflicts. 2014-12-27 02:17:07 -06:00
TZK13
615507737a Makes the "black" undershirts actually black, adds a few new undershirts and adds myself to the admins.txt. 2014-12-24 02:11:41 -06:00
Mandurrrh
0b16835c47 New Dresses and resprited Black Tango Dress 2014-12-22 18:23:11 -05:00
WJohn
777df0697d Adds myself to admin.txt 2014-12-20 20:31:32 -05:00
Hornygranny
7288f865fe undoes tortoisegit merge fuckery 2014-12-15 18:23:50 -08:00
Cuboos
0bb7d2a5a5 Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1
Conflicts:
	code/game/objects/items/weapons/defib.dm
	config/admins.txt
2014-12-15 18:12:14 -08:00
Thunder12345
8e2dc381ed FRAG-12 + admins.txt
+ FRAG-12 shotgun shells, created from the unloaded technological
shotshell
+ Adding myself to admins.txt
2014-12-11 21:16:45 +00:00
Cuboos
8175bd91e0 Mining sound revamp, using realistic sounds now instead of reusing sound. Plus improved Taser sound. 2014-12-09 19:38:49 -08:00
tkdrg
a0b61707a4 NTRC (PDA chatrooms) bugfixes
Removed operator, revamped structure, fixed a lot of bugs

Adds myself to admins.txt
2014-11-04 22:47:48 -03:00
MrStonedOne
0446b4dfaf Fixes syntax error in the moleculecular discombobulator and improves logic of the pneumatic nebulizer. 2014-10-31 21:30:32 -07:00
xxalpha
107e5b5824 Rewrites simulated/Entered logic so its a tiny more efficient 2014-10-23 23:19:11 +01:00
phil235
f40edc5ce6 *FIX: the taser that ed209 drops on death looks full but is empty(need an update icon shit)
*FIX: issue4487 (lasersound)

*Fix: repairing bot with weldingtool off. Gives warning msg.

*FIX: medbot fleeing one step when using weldtool/holosword.

*Fix: attacking silicon w/ holosword no longer gives spark.

*FIX: attacking bot w/ holosword is an assault.

*FIX: bots produce spark when damaged via attakby, similar to borgs.

*FIX: attacking ED209 with weldingtool on harm now triggers the bot response to the assault.

*FIX: bots can produce sparks when hit by projectile w/ damage>0. (to have some feedback b/c there's no msg otherwise)

*FIX: ED209 doesn't try to tase monkey despite wanting to arrest.

*FIX: LaserTAG ED209 points at monkey despite not shooting/hunting them.

*FIX: we don't check projectiletype and sound each time we fire. (Now only when using New() or emagging/hacking/emp'ing) (also

simplifying code)

*FIX: cannot access behavior mode to toggle patrol on lasertag ED209 (despite the fact that it should be able to patrol.

*FIX: ED209 tases cuffed target that are standing.

*FIX: ED209 can stun through a closet! And, it can cuff through windows and closet.

*FIX: the handcuffing problem. (issue2025)

*FIX: no message when trying to screwdriver panel of bots open but it's locked.

*FIX: added one audible message instead of for+show

*FIX: make 'detain' mean stun repeatedly. (issuenumber???)

*FIX: After finishing summon order, bot goes patrolling even if no auto_patrol.

*FIX: ED209 cannot be summoned or appear on the PDA securitron interlink cartridge.

FIX: autocustom names for lasertag ed209s doesn't work (if you don't give them a custom name, it gives them a custom one from a

list)

Removing maxstuns var in process() proc of both ED and beepsky. It doesn't do shit.
Lasertag ED no longer calls look_for_perp(), the loss in reaction speed is minimal. And it no longer calls for infraction
Adding myself as game master admin list.
2014-10-10 16:34:26 +02: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
Cheridan
7750a2baae Merge pull request #4525 from GunHog/HUDS_For_All
Silicon Medical and Security HUDs!
2014-09-07 20:01:12 -05:00
Limeliz
1f876daa7a Limeliz for Game Master
Adding myself to admins.txt
2014-09-01 14:19:33 +02:00
GunHog
81e178737d Silicon Medical and Security HUDs!
- The AI can now access both Security and Medical HUDs via a new button
on its UI. The Medical HUD is exactly equal to all others. The AI's
Security HUD cannot detect implants.

- Cyborg HUD modules have been removed in favor of an inbuilt command,
to make it less of a hassle to access them.

- HUD code has been given its own file such that it can be used by any
mob. In addition, HUD users are placed into a list instead of searching
for only humans and checking them for a HUD item. This is to make it
easier to expand.

- Security HUD messages can now be received by any mob using a SecHUD.
2014-08-21 22:59:30 -05:00
cookingboy3
64131818d8 fix for #4243, adds notification
squashed commits
2014-07-30 11:00:31 -07:00
paprka
056289a273 fixed moving between adjacent tables 2014-07-29 09:12:01 -07:00
Kelenius
8602991b4e Dammit 2014-05-21 10:03:07 +04:00
Kelenius
2c536ba92f What did I break 2014-05-21 09:56:50 +04:00
Kelenius
d749563d4c dsfsdf 2014-05-20 13:23:28 +04:00
argoneus
ba89b53445 Shamelessly added myself to the admin list 2014-04-29 20:25:57 +02:00
Cheridan
1450960ad7 Merge pull request #3462 from Niknakflak/AIdeathcore
AIs.  New cores, death cores.
2014-04-21 12:56:04 -05:00
Niknakflak
b5b17882b0 Does a lot of stuff 2014-04-20 01:42:52 -07:00
Daniel
640061cdf1 Added myself to admins.txt 2014-04-09 18:46:25 +02:00
Firecage
ed466a4c67 Customizable clown mask with 2 new options 2014-04-02 23:19:55 +02:00