Rolan7
5d931d70ef
Larvae who chestburst while their host is swallowed are now properly added to stomach_contents, so they can be regurgitated. As are the gibs from the gibbing.
...
Tidied up the loop in alien_powers.dm
2014-01-20 15:43:43 -05:00
Rolan7
5f1fae05dd
Gibbing now occurs in whatever the mob happens to be in, instead of fetching the turf.
2014-01-20 01:37:43 -05:00
Cheridan
70e5618cb0
Merge pull request #2375 from Giacom/remove_icon_operations_from_premises
...
[501] Refactored the code to remove most icon operations for changing an icon's colour.
2014-01-19 16:06:25 -08:00
fleure
cd5fb384f0
Merge pull request #2409 from Rolan7/Issue112_Powersinks
...
Fixes Issue 112, APCs not charging
2014-01-18 17:30:02 -08:00
fleure
4efa6b3114
Merge pull request #2412 from Razharas/BorgAndGhostClickDragInventory
...
Fixes borgs and ghosts storages
2014-01-18 17:29:44 -08:00
Hornygranny
01ce0f5392
Removed copypaste for cyborg metal sheets
...
Fixed typos
2014-01-17 15:45:09 -08:00
fleure
d6937897f1
Merge pull request #2399 from Glloyd/master
...
Fixes the back icons for the scythe and the Roman shield.
2014-01-17 15:23:57 -08:00
Razharas
0dcb8a8042
Fixes borgs and ghosts storages
...
Fixes #2084
2014-01-18 03:23:02 +04:00
Rolan7
f5267c22db
Fixes Issue 112 which was due to powersinks draining cells without telling the APC, resulting in the APC believing itself to be full.
2014-01-17 17:21:38 -05:00
Miauw
9c68b28425
Merge branch 'master' of https://github.com/tgstation/-tg-station into dalawisfluid
2014-01-17 17:51:37 +01:00
Glloyd
b69ab81cc6
Resolves #2213 Fixes the back icons for the scythe and the Roman shield.
2014-01-16 20:23:36 -05:00
Cheridan
e0c9a48a36
Merge pull request #2376 from Aranclanos/captainmedal
...
Adds the captain's medal to the medal's lockbox.
2014-01-16 12:51:08 -08:00
Miauw
6704a9948d
Merge branch 'master' of https://github.com/tgstation/-tg-station into dalawisfluid
2014-01-16 19:46:04 +01:00
Giacomand
aceb4b22e1
Removed the icon color blend operations from human's update_icons().
...
Changed all the hair/facial_hair/eye sprites to use a white base.
Changed the preview screen, in the preference menu, to use ICON_MULTIPLY to be able to use the new white sprites.
Removed the unused and broken cloaking item.
Ninjas now use the alpha variable, removed most of the checks for it.
Updated the documentation a bit.
Added some helper procs for later.
2014-01-16 14:33:50 +00:00
fleure
088e9fb80a
Merge pull request #2354 from Incoming5643/slimetime
...
Slime Mob Refactor
2014-01-16 06:20:03 -08:00
Aranclanos
f81ae6fb34
Adds the captain's medal to the medal's lockbox.
...
Fixes issue 2358
2014-01-15 19:10:30 -03:00
Giacomand
11bca59614
Refactored the code to remove most icon operations for changing an icon's colour. I had to manually set all the icons, which are subject to colour change, to be have a white/grey icon, so that the colours added properly, and then have them coloured in the code. This means the icons for runes, the reagent beaker overlay, smoke and etc will all be white. They now all use the new 500+ color variable.
...
The only noticeable gameplay difference is that you can't choose your graffiti's shade.
2014-01-15 21:30:55 +00: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
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
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
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
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
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
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
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