Commit Graph

4880 Commits

Author SHA1 Message Date
Robson Richards 4dabdc67e2 Fixes #2326
- Moves Robotic repair stuff to the two item's respected attack()'s
- Removed them from the human_defense.dm
2014-01-15 16:46:47 +00:00
JJRcop 4404d2462e Fixing conflicts
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2014-01-15 09:37:17 -05:00
Balrog 5a6f29b3d5 Added syndicate playing cards. As a consequence card code now supports multiple deck styles. 2014-01-14 20:24:53 -05:00
Razharas 03d1396aff Merge branch 'master' of https://github.com/tgstation/-tg-station into SayYiffYiffIfYouAreMachineFucker 2014-01-15 03:56:04 +04:00
Emil b756ddcf92 ops 2014-01-14 10:34:06 +01:00
Emil 7de6fa6a87 Removing hrefs from log_game in ghettobomb.dm
Fixes #2333
2014-01-14 10:14:56 +01:00
Emil 8ed15e8de7 Removing hrefs from log_game in chem_grenade.dm
Fixes #2333
2014-01-14 10:14:50 +01:00
Incoming 03464e1f4d Slime Mob Refactor
Death of the istype invasion from slimes, previously every single color of slime was its own kind of mob, and every single one of those slimes also had an adult form which was a different mob.

There is now only one kind of slime, reliant on new var is_adult and old var colour to determine how it looks. All baby slimes functioned identically outside of icon and core, and all adult slimes functioned identically to each other and to the babys save for a bit higher Health and more capacity to break shit.

A nice side effect is that this solves any inheritence issues of baby slimes growing up since it's still the same mob, though it doesn't solve the same issues for adult slimes splitting.

Also fixed a few annoying but rare bugs (like getting ghosted because you got DC'd and your slime self split and you weren't around to get mind transfered)
2014-01-13 19:38:37 -05:00
Razharas 93f0817010 Merge branch 'master' of https://github.com/tgstation/-tg-station into SayYiffYiffIfYouAreMachineFucker 2014-01-14 03:36:51 +04:00
sirbayer eb20908dcf Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-deadlyboolets 2014-01-13 14:08:57 -08:00
Cheridan 0b2a1b7ac4 Merge pull request #2323 from dumpdavidson/empkit_balance
Balance changes to the EMP kit
2014-01-12 13:09:56 -08:00
Giacom 6dc7736933 Merge pull request #2244 from VistaPOWA/syndieborgs
[MAP] Adds Syndicate Borgs
2014-01-12 05:30:22 -08:00
Razharas 6d4fe3d08d Conflict resolve attempt 2014-01-12 03:33:04 +04:00
Ergovisavi 4948820b67 Gibtonite - Uncommited the .dme changes, fixed countdown(), removed redundant checks 2014-01-11 12:47:30 -08:00
dumpdavidson 646df06cf9 moved when the emp_act is called in the afteratack proc of the emp flashlight
using absolute paths everywhere now.
adds a backslash to prevent "The the flashlight..."
2014-01-11 21:40:15 +01:00
dumpdavidson cf672d2c29 Balance changes to the EMP kit:
- EMP-Flashlight now has one charge less but recharges (slower than lasers/energy crossbows do)
- EMP-Flashlight description no longer reveals the nature of the device
- EMP implant now has two uses
- EMP kit now contains two grenades
- EMP and adrenaline implants now inform the user how many charges they contain to begin with (freedom doesn't because it's intentionally random)

- Fixes EMP flashlight sometimes going down to -1 charges.
2014-01-11 21:04:35 +01:00
Malkevin a8c153a290 A bunch of bug fixes
-fixed space ninjas not being able to charge directly from power cells - fixes #2139

-'fixed' Distro/Waste Monitors not displaying pressure read out when sensor was reading zero pressure - fixes #
227

-removed the canmove check on camera consoles - fixes #490

-Fixed stealmin's real ckeys showing in the admin-pm reply dialog's title - partially fixes #2163

-Fixed people buckled to chairs not dropping their items when appropriate (like when dead) - fixes #2172

-Fixed people being able to use uplink functions whilst stunned/dead/etc - fixes #2144
2014-01-11 18:37:31 +00:00
Giacom c8120da49c Merge pull request #2283 from YotaXP/list2text-refactor
Optimized and refactored list2text, text2list, and replacetext.
2014-01-11 10:11:13 -08:00
YotaXP cb0516f909 Corrected my own grammar failings. 2014-01-11 12:51:42 -05:00
VistaPOWA 0afe5c982d merging upstream master into local repo 2014-01-11 17:14:48 +01:00
Aranclanos baa86c8819 Merge pull request #2305 from Giacom/removed_set_background
Disabled the game using "set background" by making all instances of it use a define
2014-01-11 08:14:15 -08:00
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
Giacom c1d228a96e Merge pull request #2282 from Cheridan/Magic
Upgradeable Laser Pointers!
2014-01-11 06:09:19 -08:00
Giacom 03eea5642c Merge pull request #2257 from errorage/2014_01_06_borg_module_ui_update
Cyborg module selection UI update
2014-01-11 04:33:03 -08:00
Giacom 7b5e401ee6 Merge pull request #2275 from JJRcop/nuke-toy
Adds new nuke toy
2014-01-11 04:22:20 -08:00
Razharas 551a7ab0a3 Issues fixing
Added biogenerator and freezer/heater
Fixed issues gia pointed out
Added some lost sprites
2014-01-11 00:56:28 +04:00
Cheridan c10d9b2611 fixing my fixes 2014-01-10 14:10:30 -06:00
Giacomand f1e7637bab Disabled the game using set background by making all instances of it use a define, which can be changed in code/_compile_options.dm
Testing has revealed that it reduces the sluggishness of the game, though it will spike from lag when the singularity is loose. Thanks to ChuckTheSheep for suggesting it.

Server owners who want to keep set background enabled can do so by changing the define.
2014-01-10 18:32:28 +00:00
Giacom 4304107d26 Merge pull request #2242 from ChuckTheSheep/Morgue-Changes
Morgue Changes
2014-01-10 08:19:33 -08:00
Razharas 1685dd3b7a Machine overhaul 2: Constructable Revolution
Yeah i lost half of my work so its only other half
Durning this PR ill try to redo what was lost, in no way is it a
complete thing
Hope git wont do anything bad with it
2014-01-10 18:53:26 +04:00
Aranclanos 769e9dd9a7 Merge pull request #2137 from Rumia29/23/12/2013-rdaltuniform
Adds an alt RD uniform to the RDs locker
2014-01-10 00:52:09 -08:00
Aranclanos 3d6eb6dd3d Fixed tables not working 2014-01-09 18:54:54 -03:00
ChuckTheSheep 8e050332d6 Cleans up the for() and list handling in update. 2014-01-08 18:12:17 -05:00
Cheridan 397b2f07e8 fixes 2014-01-08 10:42:12 -06:00
JJRcop 0ef530326a Minor nuke toy edit
Moved the user.visible_message call out of spawn()
Removed the now obsolete sleep() call and put the delay in spawn()
2014-01-08 09:52:00 -05:00
YotaXP f98a57b750 Optimized and refactored list2text, text2list, and replacetext.
Also fixed some grammar in the station blueprint code.
2014-01-07 22:15:25 -05:00
Cheridan 937ac275ff Upgradeable Laser Pointers!
Laser pointers can be upgraded with laser stock parts, which increases the odds of hitting a target.
Whee!
2014-01-07 19:54:51 -06:00
JJRcop 8feb37969e More dead colons and pipes use their initial name when changing it 2014-01-07 20:49:13 -05:00
JJRcop 01f229a60d Adds "surround" arg to playsound, which enables 3D sound
Defaulted to on
Also changes the toy nuke to use it
2014-01-07 17:45:12 -05:00
JJRcop b82af39ed1 dds Drying Rack, Various Plants, Rollies, Pipes, and Torches
Any and all content credit to @Adrinus and @Iamgoofball
I simply re-applied all the changes by hand so it is compatible with current code
 #1893
2014-01-07 15:40:49 -05:00
Miauw 67e37bd449 Merge branch 'master' of https://github.com/tgstation/-tg-station into dalawisfluid
Conflicts:
	code/game/objects/items/weapons/AI_modules.dm
	code/modules/research/designs.dm
	maps/tgstation.2.1.2.dmm
2014-01-07 18:18:59 +01:00
Cheridan afd6b5fa22 Merge pull request #2266 from fleure/janradio
Gives janitor service headset
2014-01-07 08:37:24 -08:00
JJRcop 1300e3ebf3 Adds a visible_message to the nuke toy when it is used 2014-01-07 11:20:19 -05:00
Cheridan 1a58a3cf86 Merge pull request #2265 from fleure/watertank
Reduced watertank slowdown slightly
2014-01-07 08:16:10 -08:00
Giacom 9602bd2c14 Merge pull request #2256 from Aranclanos/RRpls
Half of the runtimes of four days here
2014-01-07 06:24:57 -08:00
ChuckTheSheep 676dc5269a Moved Login/Logout to their defined files 2014-01-06 21:25:10 -05:00
ChuckTheSheep 9f314fcb07 Made the Login/out()s involved under mob 2014-01-06 21:20:36 -05:00
sirbayer 45cb745b6b Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-deadlyboolets
Conflicts:
	code/modules/projectiles/guns/magic.dm
2014-01-06 17:59:15 -08:00
ChuckTheSheep 1d7858d54f Fixes regarding path case 2014-01-06 18:01:28 -05:00
Cheridan 58159a00ad Merge pull request #2105 from RobRichards1997/20/12/2013-Poker_Tables
Poker tables
2014-01-06 14:35:03 -08:00