7939e94137
Change cult see and drug checks for see_invisible
2014-01-18 15:17:15 +02:00
9468c30e05
Merge pull request #2374 from tgstation/501
...
Merging 501 with Master.
2014-01-17 21:33:46 -08:00
f693f58e49
removes space worms :(. They are in a better place now.
2014-01-17 19:32:31 -07:00
401455f1d0
Fixes animal necrophilia
2014-01-17 17:07:52 -08:00
d664e5265c
Cleaning up and a new discovery, for me, means you don't have to unsanitize the color.
2014-01-18 00:25:33 +00:00
44a48654c3
Fixes borgs sparking when hit with 0 damage items
...
Fixes #1710
2014-01-18 03:55:50 +04:00
0bed41ceb2
Merge branch 'master' of https://github.com/tgstation/-tg-station into Miningmobs
2014-01-16 21:17:25 -08:00
32fdea37b8
Asteroid/Mining Mobs ver 1
2014-01-16 21:05:02 -08:00
6704a9948d
Merge branch 'master' of https://github.com/tgstation/-tg-station into dalawisfluid
2014-01-16 19:46:04 +01:00
5c3daf3a45
Increased speed of animate calls to 2.
...
Added a pixel_y component to better align laying down with current laying down and look more like lying on the floor rather than floating in the air.
2014-01-16 10:22:26 -08:00
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
088e9fb80a
Merge pull request #2354 from Incoming5643/slimetime
...
Slime Mob Refactor
2014-01-16 06:20:03 -08:00
393204012a
Wow RobRichards thanks for making Jenkins cry
2014-01-15 20:31:59 -08:00
5987de4804
Redo on that merge into master, my bad.
2014-01-15 20:12:52 -08:00
9a562efb35
Update to master (branch was way out of date)
2014-01-15 19:34:35 -08:00
2f90172273
Give mob/living a cloak_stacks list. If there's anything in this list, cloak the mob upon the next update_transform().
...
Give all mob/living/carbon a shared update_transform(). Larva have their own because they're special.
2014-01-15 19:23:57 -08:00
ea5c85d4eb
* Removed the icon operations from the kitty ears by removing their changing colour gimmick.
...
* Removed hacky checks for the item.
2014-01-15 22:01:37 +00:00
a8b754f42f
Merge branch 'master' of https://github.com/tgstation/-tg-station into 501
2014-01-15 19:01:15 +00:00
6e3a3ce549
Merge branch 'master' of https://github.com/Giacom/-tg-station into 501
...
Conflicts:
code/_onclick/hud/hud.dm
code/_onclick/hud/human.dm
code/modules/mob/living/carbon/human/life.dm
icons/mob/screen_gen.dmi
2014-01-15 18:32:55 +00:00
71c4ba80ad
spans metroid.dm
2014-01-15 13:01:34 -05:00
86eae3a376
Moves some use()'s so that they always execute the message near them.
2014-01-15 17:19:49 +00:00
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
de4cd20283
- Emagged borgs' hidden inventory will now become visible in the module selection section.
...
- Also removed the now outdated module selection UI button and rearranged borg UI buttons to reflect this.
Screenshot: http://www.ss13.eu/borg_ui_smaller_bottom_right.png
2014-01-15 15:06:00 +01:00
210ee363d6
i missed exactly one
2014-01-14 23:46:55 -08:00
a7e5165703
Puts the mime's vow of silence to his mind
...
- cleaned up emotes
- put the mime’s vow of silence and his spells to his mind
- merge conflicts resolved
2014-01-14 21:58:00 +02:00
b6467378a2
Merge pull request #2304 from Giacom/emagged_destroy_mmi
...
Emagged Cyborgs, when destroyed via the Robotics Console, will not only have a large explosion but their MMI will die with them.
2014-01-14 10:34:46 -08:00
8a56589e3e
Merge pull request #2292 from sirbayer/srsbsns-determinism
...
Remove RNG from armor
2014-01-14 05:01:24 -08:00
62e4dbaf43
Merge pull request #2336 from Tenebrosity/deadmonkeyslimespawn
...
Fixes map corpse spawn bugs and expands on spawning corpses on the map
2014-01-14 03:16:01 -08:00
5715241409
Removed a bit of code from a merge conflict I apparenty resolved incompletely.
...
Doing great with commit numbers, as usual.
2014-01-13 22:00:10 -05:00
9460f1b5c2
Adds a placeholder core in case admins var edit a slime to "rainbow", which is a valid icon. They will be able to grow and breed just like a normal slime, their cores don't do anything.
...
fixes a bug in my own code with something that was double string'd.
2014-01-13 21:09:29 -05:00
6c6684a3be
Merge branch 'master' of https://github.com/tgstation/-tg-station into slimetime
...
Conflicts:
code/modules/mob/living/simple_animal/simple_animal.dm
2014-01-13 19:55:14 -05:00
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
a3760dfba1
Merge pull request #2311 from fleure/spider
...
Added spider meat, meals, and butchering
2014-01-13 14:21:20 -08:00
ff70b47100
Merge pull request #2318 from Giacom/killing_me_softly
...
Tidied up the robotics computer code.
2014-01-13 12:11:56 -08:00
bb8f5e928f
Merge pull request #2334 from VistaPOWA/syndieborg_emergency_fixes
...
Syndicate Borg emergency fixes (please merge and push to server quick before some shitler fucks over the entire op team just because lellaws)
2014-01-13 12:07:39 -08:00
5766aec2aa
Merge pull request #2328 from Incoming5643/GlassCeiling
...
[Tumblr] Sausage Party Reduction
2014-01-13 01:57:19 -08:00
6eeb8149d8
Merge pull request #2306 from hornygranny/alienspit
...
Code by Giacom. Changes alien neurotoxin spit to dumbfire.
2014-01-12 23:42:36 -08:00
68a6131c22
Fixes bugs that prevent spawning dead slimes and dead monkeys before roundstart.
2014-01-13 12:38:31 +13:00
0a9bc1ba13
Syndicate Borg emergency fixes
...
-Syndicate Borgs will no longer synch to AI
-Syndicate Borgs can no longer emag themselves
-Syndicate Borgs will get the proper faction assigned to them,
preventing viscerators from tearing them apart.
2014-01-12 23:20:57 +01:00
45d05c7866
Merge pull request #2321 from dumpdavidson/empfix
...
Fixes EMPs not working on humans.
2014-01-12 13:17:16 -08:00
467c784580
Merge pull request #2303 from Bobylein/fixReviveOxyloss
...
Fixed #1605 oxyloss from suicide after admin revive.
2014-01-12 05:38:43 -08:00
6dc7736933
Merge pull request #2244 from VistaPOWA/syndieborgs
...
[MAP] Adds Syndicate Borgs
2014-01-12 05:30:22 -08:00
f993585486
[tumblr approved] Sausage Party Reduction
...
*Lets adamantine golems and ninjas generate female where before they were generated exclusively male.
The ninja spacesuit has a coded in female variant that has existed forever but was not actually used. It only shows up upon suit ACTIVATION because (?:?:?)|\|i|\|j4c0d3(?:?:?).
Likewise female adamantine golems have their own sprites and can show up in staff of change shots, but ones generated from the rune were always male.
This does NOT effect admin summoned unknown humans, those are all still male.
2014-01-12 04:33:45 -05:00
d2a92b3063
Merge pull request #2260 from Giacom/recycler_emag
...
[MAP] Re-added the recycler's emag functionality and changed it so that it does massive brute damage and eats the person's equipped items
2014-01-11 12:27:13 -08:00
8f49eee681
Fixes EMPs not working on humans.
2014-01-11 20:30:59 +01:00
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
c8120da49c
Merge pull request #2283 from YotaXP/list2text-refactor
...
Optimized and refactored list2text, text2list, and replacetext.
2014-01-11 10:11:13 -08:00
0afe5c982d
merging upstream master into local repo
2014-01-11 17:14:48 +01:00
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
7621973743
Tidied up the robotics computer code.
...
Removed exploits, such as being able to keep the input menu open to blow up borgs when you want.
Removed the obsolete global killswitch.
2014-01-11 16:12:18 +00:00
adrix89
Cheridan
KazeEspada
Hornygranny
Giacomand
Razharas
Ergovisavi
Miauw
MrPerson
fleure
Incoming
Robson Richards
errorage
sirbayer
Perakp
Aranclanos
Jesus Hussein Chris
VistaPOWA
dumpdavidson
Malkevin
