Commit Graph

1216 Commits

Author SHA1 Message Date
VistaPOWA
671b49cba1 Fixes the double-energy draw of the esword, makes the syndicate icon properly display for the borg. 2014-01-11 17:04:17 +01:00
VistaPOWA
74f2edcb56 Makes the borg spawner and the contract a subtype of antag_spawner 2014-01-05 21:32:43 +01:00
VistaPOWA
2dcde243f3 Made the teleporter refundable
Also fixes a missing return
2014-01-05 17:29:34 +01:00
VistaPOWA
68afbbcc18 move along people, nothing to see here 2014-01-05 03:35:17 +01:00
VistaPOWA
fd34cea8ef fixes the merging failure
hopefully that's it
2014-01-05 03:32:10 +01:00
VistaPOWA
443d6e2d9e [MAP] Adds Syndicate Borgs
Nuclear Operatives can now order a Syndicate Borg for 20TC. After
spawned, a candidate from ghosts is chosen to control it.
It has a 25k cell and the following modules:
-Emag
-Esword
-Ebow
-Laser Rifle
-Jetpack

All weapons use 100 charge per shot.

2 borg rechargers have been added to the Syndicate Shuttle for the
Syndieborgs to use.
Changelog will be added in a separate commit.
2014-01-05 03:13:40 +01:00
Giacom
09da906881 Merge pull request #2187 from Tenebrosity/newradiofrequencycolours
Adds new radio frequency colours
2014-01-02 10:41:09 -08:00
Cheridan
3a11af405c Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2192
Conflicts:
	code/modules/clothing/head/misc.dm
2014-01-02 10:00:58 -06:00
fleure
be0f52b623 Fixed bruisepacks not working 2013-12-31 17:06:34 +00:00
Tenebrosity
b3d37e1d0a Makes deathsquad frequency (144.1) a different colour again, this time grey to differentiate it from science's plum. 2013-12-31 16:50:17 +13:00
Cheridan
bb9c09df46 Obsoletes flags = FPRINT | TABLEPASS*
*TABLEPASS was already totally obsolete.
FPRINT was used, but it was on virtually everything anyway.

Removes those flags from every instance where they were used. Also assigned and removed other flags where it made sense.

If it is desired, I can revive the flag as NOFPRINT, which would retain the original functionality, though inverted. That way it would be be used only  where it was intentional (holodeck items could use this for example).
2013-12-30 15:03:17 -06:00
Aranclanos
d5ddac3a00 Merge pull request #1934 from RobRichards1997/30/11/2013-Toxic-Converter-Cyberlimb-Fix
Cyber limbs fixes [FIXES #1920] + [Fixes #2180] + [RUNTIME FIX]
2013-12-30 10:23:54 -08:00
Tenebrosity
e4b251a488 Adds different radio frequency colours for engineering, security, medical, service and supply. 2013-12-30 20:09:35 +13:00
Robson Richards
d3d4c79946 Merges Heal_Damage and Heal_robotic_damage procs
like I should have done in the first place.
Corrects all usages of Heal_damage so it works with the changed version.
Same goes for Heal_robotic_damage
2013-12-29 17:40:12 +00:00
Robson Richards
53bfd06609 Fixes #2180 - Augmented limb healing issues 2013-12-29 16:12:32 +00:00
Rockdtben
92636bbe01 Merge pull request #2168 from fleure/toolbox
Fixed toolbox parent object giving error
2013-12-29 08:00:11 -08:00
fleure
171147b1bf Fixed toolbox parent object giving error 2013-12-28 14:51:35 +00:00
Cluwnes Honk
2482fd0702 Makes cards pocketable.
Adds w_classes to cards so you can actually pocket the things.
2013-12-27 15:49:21 -08:00
Cheridan
b9efeaa932 Merge pull request #2014 from kyrahabattoir/ItemNameFixingRound3
Item name fixing round3
2013-12-26 23:14:15 -08:00
Cheridan
ef25332511 Merge pull request #2125 from Miauw62/ifitfeelsright
Folding boxes updates sprites properly
2013-12-26 20:13:09 -08:00
Miauw
0c8c6a5de2 Fixed #1119 folding boxes updates sprites properly 2013-12-22 19:21:45 +01:00
Miauw
0338a66c2a Adds fingerprints to a bunch of stuff. De-texts computer build paths. 2013-12-22 18:57:33 +01:00
Kyrah Abattoir
df626a1f06 correct paint can names and plural status, corrected pill box names, corrected lockbox names. 2013-12-22 11:28:10 +01:00
Aranclanos
f00c80bd43 Merge pull request #2104 from Giacom/gulag_therevenge
[MAP] The Gulag: The Revenge: Part 2.5
2013-12-21 15:05:57 -08:00
Aranclanos
e7579e2aa8 Merge pull request #1986 from Perakp/janitorCartFix
Fixes janiborg interaction with janicarts
2013-12-21 15:01:37 -08:00
Giacom
516ec6076d Merge pull request #2102 from Razharas/Flamethrower
Fixes flamethrowers shooting through stuff
2013-12-21 13:57:33 -08:00
Giacom
9d24a900ae Merge pull request #2066 from Perakp/slipFix4
No slipping when lying down
2013-12-21 13:54:39 -08:00
Perakp
c40af6ae40 Update icons after item is placed in cart. 2013-12-21 09:50:15 +02:00
Perakp
65e0931d55 Merge branch 'master' into janitorCartFix
Conflicts:
	code/game/objects/items/weapons/storage/storage.dm
2013-12-21 09:40:06 +02:00
Giacomand
47545f439e * Added ore boxes to the gulag, and added a conveyor belt which goes outside and has a loading machine, which will take the ore from the orebox.
* Added sprites for the stacking machine going in the reverse direction, just set the dir to 1 instead of 2.
 * Added prison intercoms which will not broadcast until someone hacks it. Added these intercoms in the gulag, the perma brig and the brig cells.
 * When a prisoner has received enough points for freedom, if they try to move the shuttle, or open the middle door, while someone is on it they will get an error message. This way there is no way for a free'd prisoner to release their fellow prisoners once they have reached their point target. The shuttle will depart right away when you call the shuttle from the stacking console, to stop prisoners from getting on while it departs.
2013-12-20 22:09:06 +00:00
Razharas
ae6a4d9b18 Fixes flamethrowers shooting through stuff
Fixed #2059
They need to be fixed more, but thats a theme for another PR
2013-12-20 22:57:41 +04:00
Cheridan
0f016a054f Merge pull request #2078 from Razharas/train
Fixes chameleon projector
2013-12-19 21:54:17 -08:00
Aranclanos
0fdcd42592 Merge pull request #2054 from Cheridan/Nuke
Nuke Ops Tweaks: Flamer and Mechas
2013-12-19 13:37:32 -08:00
Perakp
2f70aaadb3 Removes magic numbers and an useless check
- it shouldn’t runtime.
2013-12-18 22:31:07 +02:00
Razharas
bce9e5d826 Fixes chameleon projector 2013-12-19 00:01:59 +04:00
Perakp
68ff764463 Subtypes of janiborg tools
- The other way of fixing it. I’m not sure why this is better.
- Removed condescending messages to cyborgs.
2013-12-18 20:44:24 +02:00
Aranclanos
7bb4cf6a79 Makes the attackby() of storage objects return 0 if the can_be_insterted() fails. This will fix hand labelers on pill bottles. 2013-12-18 12:25:39 -03:00
Perakp
b54cab665a No slipping when lying down
- No slipping when lying down
- Doesn’t change slipping mechanics otherwise.
2013-12-18 15:03:03 +02:00
Aranclanos
f1677efdea Merge pull request #2040 from Razharas/master
Some logging and fingerprints
2013-12-17 21:03:36 -08:00
Razharas
358a85eb3d Completed the transition to a new proc
All the logging i have found in the code was changed to use the
proc(maybe i missed something)
Killed all runtimes found so far
Proc now handles all the checks, no need to add checks in the body of
object
2013-12-17 22:56:04 +04:00
Cheridan
b68eadfb14 Nuke Op Tweaks
In response to feedback:
Dark Gygax no longer has the scattershot. Instead, it has a modestly powerful carbine loaded with incendiary rounds, solidifying its role as a hit-and-run and squad-support platform.
The Mauler now has the scattershot in addition to its existing arsenal, to give it that edge against crowds that you'll need at those higher populations.

Included with the new mecha weapon is a minor code refactoring of mech guns... There shouldn't be any noticable changes to the user. mech code is awful, guys
New sound effect for mecha launchers (Having the same sound effect for projectile launching and exploding drove me nuts.).

Nuke op flamethrowers now start with a full tank.
2013-12-16 23:56:49 -06:00
Adrinus
1d173fe020 Adds a deck of cards. Works like real cards, without all the shuffling.
Fixed a few unforseen bugs and smoothed out a few odd quirks.
Fixed bugs, added flipping mechanics. Made the cards less cheater friendly by making certain actions visible.
Added the ability to choose between "Random Card" and "draw from Top" with a verb on the deck.
While held in hand the deck can now be shuffled.
Had to improve sprites, was really bugging me.
Now uses the shuffle() list helper.
Added cardshuffle.ogg to sound/items/
Cooldown applied to shuffling for "sanity" as the term seems to be.
Made a few changes to the way the cards prompt you for less clutter.
Merge pull request #1 from Zelacks/deckstuff
Replaces the global decks variable with a reference
Now card is taken from hand on topic choice.
Examine card has been scrapped, just attack_self() with the card to see what it is.
New Icons. Dig that NanoTrasen blue. Thanks Nienhaus!
Merge pull request #2 from Zelacks/deckstuff
Hopefully you will like these changes - Several deck changes
Fixed a few nits and picks.
Made Deck of Cards available as a prize from the arcade machines.
Merge pull request #3 from Zelacks/deckstuff
Card sprites! Thanks, was toying with doing that, saved me a bundle of work!
Fixed the adjacency issue.
Added more checks to the cards and object verb.
Adeed a series of fixes to the Mousedrop function. Made all notices uniform. Made changes to keep cards being flipped by the wrong sorts.
Added Razharas' "more readable" pixel art for the cards.
Made messages about the deck work while the deck is held. (I guess you might want to carry it)
Un-Needed cooldown removed from shuffling the deck.
Added blue contours to the cards to make them stand out against floor tiles.
Merge branch 'master' into 11-23-2013-Games
2013-12-15 23:43:08 -05:00
Giacomand
ceec829294 Tons of typo fixes and renames Centcomm to Centcom. Manual merge of #1950. 2013-12-13 21:14:23 +00:00
Kyrah Abattoir
3496dc4e0a Merge branch 'master' into ItemNameFixingRound3 2013-12-10 17:32:45 +01:00
Aranclanos
de11cd2934 for extra prettiness, the (x,y,z) coordinates on the game logs of transfer valves no longer have spaces between them. 2013-12-08 16:10:58 -03:00
Aranclanos
cd9778c7db Fixes the code not compiling. I blame myself. And everyone else. 2013-12-08 16:08:37 -03:00
Aranclanos
552c77fd81 Merge pull request #1990 from VistaPOWA/aluminium
Replaces 'aluminum' with 'aluminium'.
2013-12-08 07:32:54 -08:00
Aranclanos
498ba1acd4 Merge pull request #1964 from Limeliz/href-fixes-round-3
Href fixes round 3
2013-12-08 07:10:15 -08:00
Aranclanos
8251c0ea42 Merge branch 'HydroTweaksNov2013' of https://github.com/Rolan7/-tg-station into HydroTweaksNov2013
Conflicts:
	html/changelog.html
2013-12-08 06:29:48 -03:00
VistaPOWA
1041d7081d Replaces 'aluminum' with 'aluminium'.
Hopefully there won't be a grammar war because of this.
2013-12-07 14:42:25 +01:00