Commit Graph

7166 Commits

Author SHA1 Message Date
Cheridan e3f82955e4 Merge pull request #2080 from Razharas/no
Fixes morgue trays used by ghosts and what not
2013-12-21 01:12:04 -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
Robson Richards 290d8801bd Craft Poker tables with wooden tables and Astroturf(grass) 2013-12-21 00:34:56 +00:00
Robson Richards b7fe3a8e64 Seedy dealings in Seedy places, Adds the Poker_table (Sprites by Nienhaus) 2013-12-20 23:02:19 +00: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
Miauw 61eb26c663 Finalized AI module refactoring. Everything works now. 2013-12-20 19:39:46 +01:00
Miauw 83b96f0c54 Changes Antimov over to the new AI law system and changes it's path on the map. Various fixes to the new system. 2013-12-20 19:09:39 +01:00
Miauw aa655092c5 Major changes & copypasta removal in AI module code.
This won't affect gameplay.
(Untested & map won't compile, I want to have the map in a seperate commit)
2013-12-20 17:10:47 +01:00
Cheridan 0f016a054f Merge pull request #2078 from Razharas/train
Fixes chameleon projector
2013-12-19 21:54:17 -08:00
Aranclanos 213f3fff31 Some fixes for Linda, now the Move() proc of objects that block air is different. Example below.
object/Move()
   var/turf/T = loc
   ..()
   move_update_air(T)
2013-12-19 22:13:21 -03:00
Robson Richards f8c05e2169 Security Sprite updates.
Replaces all instances of the old Swat and riot sprites with Validsalad's new ones
Replaces Sechailer's with Officer, Warden and HoS versions code and Sprites wise (Sptires by Validsalad again)
The officer gas mask is gas/sechailer, the warden's is gas/sechailer/warden and the HoS's is gas/sechailer/hos
2013-12-19 23:14:51 +00:00
Aranclanos 0fdcd42592 Merge pull request #2054 from Cheridan/Nuke
Nuke Ops Tweaks: Flamer and Mechas
2013-12-19 13:37:32 -08:00
Robson Richards 89349c0102 Add's IntigAsimov lawset as 'Asimov++' 2013-12-19 20:05:39 +00:00
Miauw 2988b2b698 Changes Corporate to Kaze's popular Corporate2. 2013-12-19 17:39:25 +01:00
Perakp 2f70aaadb3 Removes magic numbers and an useless check
- it shouldn’t runtime.
2013-12-18 22:31:07 +02:00
Razharas 1ce0b11b0d Fixes morgue trays used by ghosts and what not 2013-12-19 00:23:36 +04: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
Nienhaus ab76fe339d Forgot a .
...
2013-12-18 00:11:26 -06:00
Nienhaus 70b0252797 Holy fuck English
I hate what I speak.
2013-12-18 00:10:30 -06:00
Nienhaus 47fab14f9f Very English!
I suck at spelling and grammar.
2013-12-18 00:00:15 -06:00
Nienhaus 8bf9e63966 Posters
Hey look, Posters!
http://puu.sh/5QlUx.dmi
Image
2013-12-17 23:36:56 -06: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
Perakp 088b5afe93 Following code standards
- One statement per line.
2013-12-14 17:49:51 +02:00
Giacom 7473950247 Merge pull request #1996 from Incoming5643/happyholidays
[map] Do they know it's Christmas time at all?
2013-12-13 13:30:24 -08: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
Incoming 3432aaf583 Adds a christmas tree to the bar
Adds a festivus pole to the science break room
Adds a santa outfit to the captains office so he can spread cheer to the crew
2013-12-08 13:23:55 -05: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
Giacom c1304ef0c8 Merge pull request #1971 from adrix89/Crate_Explostion
Fixed crate not blowing up properly.
2013-12-07 04:54:09 -08:00
Perakp e4c3ca5fb8 Janiborgs can no longer place their mop, light replacer or trash bag in the janicart. Fixes #1954
Language fix "this the" -> "the" in storage.dm
2013-12-06 13:00:11 +02:00
Aranclanos 870d23ccf4 Merge branch 'icons' of https://github.com/Jordie0608/-tg-station into icons
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/weapons.dmi
2013-12-05 08:32:53 -03:00
Aranclanos a4a13681f3 Merge branch 'master' of https://github.com/Razharas/-tg-station into ImGonnaStingYa
Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
2013-12-05 07:01:09 -03:00
adrix89 49282cd604 Fixed not blowing up properly.
Use closet ex_act instead.
2013-12-04 10:03:12 +02:00
Emil e2a6628aec Removing href-tags from log_game in grenade.dm
Cleaning up after Ikarrus @ 2f92f67a
2013-12-03 21:33:58 +01:00
Emil 72e16e4482 Removing href-tags from log_game in transfer_valve.dm
Not sure I'm doing this the best way, but I couldn't come up with a cleaner way. Suggestions are welcome!
2013-12-03 16:54:38 +01:00
Emil e5fd8f7070 Removing href-tags from log_game in transfer_valve.dm
Not sure I'm doing this the best way, but I couldn't come up with a cleaner way. Suggestions are welcome!
2013-12-03 10:39:53 +01:00
Rolan7 3e642f7adc Merge branch 'master' of https://github.com/tgstation/-tg-station into HydroTweaksNov2013 2013-12-01 21:04:20 -05:00