Commit Graph

15655 Commits

Author SHA1 Message Date
phil235
0cef9e5539 Merge pull request #8198 from Xhuis/cigar_cases
Adds cigar cases
2015-03-30 18:47:46 +02:00
Sawu
7c9aab6e19 * Adds spraycans to gang members as well.
* Fixed a spelling mistake.
2015-03-31 02:31:40 +11:00
Sawu
bfd0436324 See #7217
* Spraycans are given to Revheads
* Spraycans act as instant use crayons.
* Spraycans can be used on walls.
* Spraycans can be used as ghetto pepper spray, but leave the target with a coloured face (can be removed with space-cleaner)

(Old pictures, there is now only one can that changes color)

![can1](https://cloud.githubusercontent.com/assets/3829126/5812999/c3992e38-a0c9-11e4-8620-3e1ecbc97630.PNG)
![can2](https://cloud.githubusercontent.com/assets/3829126/5813002/c92d56d0-a0c9-11e4-8592-6ae15f594ca8.PNG)
![cap3](https://cloud.githubusercontent.com/assets/3829126/5825994/88a9260a-a143-11e4-8cd7-cd4491b0db2a.PNG)
![can4](https://cloud.githubusercontent.com/assets/3829126/5828055/28766ffc-a154-11e4-8bfb-f8475c84c6a4.PNG)
2015-03-31 02:26:05 +11:00
Cheridan
caecd36d7c Merge pull request #8552 from Jordie0608/togetwiththetimesyouwillfirsthaveotfindthem
Removes old player panel
2015-03-30 09:57:39 -05:00
Cheridan
724759a01f Merge pull request #8611 from phil235/BotanyFix1
Two botany fixes
2015-03-30 09:51:24 -05:00
Cheridan
74d2d67280 Merge pull request #8604 from Niknakflak/NakedCorgis
Adds the ability to shave all types of corgis
2015-03-30 08:26:01 -05:00
Incoming
3f846a0234 Fixes the spare blob overminds being created on split conciousness
Fixes blobs getting kicked to lobby when killed
2015-03-29 22:15:49 -04:00
Cheridan
884e9e3774 Day Who-Knows: Bar Gambling Expansion!
Space cash is stacks
Adds dealer table to map
2015-03-29 18:09:54 -05:00
Remie Richards
042f62bdde Merge pull request #8623 from sawu-tg/sawu-tg-patch-1
Fixes NPCPool stat runtime
2015-03-29 23:37:08 +01:00
Sawu
1142cbd355 Fixes NPCPool stat runtime 2015-03-30 09:35:33 +11:00
NikNakFlak
010fed04c6 Spelling 2015-03-29 15:30:58 -07:00
phil235
0745219d06 Fixes tableclimber knocking themself off the table when clicking it mid-climb. 2015-03-29 23:57:47 +02:00
phil235
85ed447129 Fix goon mutations not being initialized somehow... 2015-03-29 22:23:19 +02:00
NikNakFlak
306adf7d95 Corgi fixes. 2015-03-29 13:21:56 -07:00
Cheridan
bf36e8d040 Merge pull request #8615 from sawu-tg/npcpool
Updates the NPCPool to current branch.
2015-03-29 15:10:15 -05:00
NikNakFlak
a4c870669d Code changes to corgi.dm and changelog 2015-03-29 12:44:42 -07:00
Xhuis
932cac081a Separates ship ambience and area ambience 2015-03-29 14:49:59 -04:00
Swag McYolosteinen
8d87453501 Merge pull request #8542 from GunHog/ntsl_exSPANsion
NTSL Expansion!
2015-03-29 19:41:00 +02:00
Sawu
ab776cf014 Updates the NPCPool to current branch.
see #7012
* NPCPool will co-ordinate and organize all SNPCs, making them stronger and more intelligent.
* SNPCs can use the botPool system to co-ordinate and delegate with each other.
* SNPCs have been given factions to allow interoperability between certain types of SNPCs.
* Bots (machinery/bot) can use the system too for basic help and coordination.
2015-03-30 02:50:21 +11:00
xxalpha
66c47c98e1 Added check for inbuilt jetpack in movement_delay proc. 2015-03-29 16:15:13 +01:00
phil235
c2dec1e970 Fixes runtimes linked to acquiring and losing mutations .
Moves goon mutations to mutations.dm .
2015-03-29 17:11:42 +02:00
xxalpha
937aea030f Merge remote-tracking branch 'upstream/master' into fasterspace
Conflicts:
	code/modules/mob/living/carbon/human/species.dm
2015-03-29 15:30:38 +01:00
Jordie
d78ca0c57a Merge pull request #8566 from Incoming5643/literal_fun_removal
Magic Mania NaN: The Fun Ends Here
2015-03-30 01:25:52 +11:00
Jordie
fdbef46277 Merge pull request #8543 from Szunti/mining-mobs-night-vision
Night vision for mining mobs
2015-03-30 01:22:53 +11:00
Jordie
373516e522 Merge pull request #8579 from phil235/WelderInClosetFix
Fixes not being able to put unlit welding tool in open closets
2015-03-30 01:22:35 +11:00
Jordie
8113c2a1f0 Merge pull request #8483 from xxalpha/c4fix
Fixes the C4 being planted on the DA.
2015-03-30 01:21:52 +11:00
Jordie
c8e0c16d09 Merge pull request #8520 from MrPerson/effect_cleanup
Effect pooling
2015-03-30 01:21:40 +11:00
Jordie
7619e4977e Merge pull request #8536 from joonoro/poddoorfix
fix poddoors leaking gasses
2015-03-30 01:21:29 +11:00
Jordie
eb5c73500a Merge pull request #8524 from AnturK/bzzt
Adds Lightning Bolt spell
2015-03-30 01:21:19 +11:00
Jordie
f5cf0dd3e9 Merge pull request #8392 from xxalpha/hardjet
Embedded Jetpacks
2015-03-30 01:21:05 +11:00
Jordie
98873da060 Merge pull request #8549 from tedward1337/Ohgodthisishard
Adds Bluespace artillery button.
2015-03-30 01:20:45 +11:00
Remie Richards
2dec0e8fa4 Fixes Hat removal code by reticking carbon/inventory and moving carbon inventory code back there. (Mystery coder who undid this, Curse you!) 2015-03-29 14:45:09 +01:00
phil235
e2eda9cda8 Fixes growing rice stalk being invisible at later stages.
Fixes empty trays not receiving the nutrient/reagents/water you give it.
2015-03-29 15:15:49 +02:00
Iamgoofball
3d61826a6a Fixes *flip 2015-03-28 23:04:50 -07:00
Fayrik
7336e6ecb8 Call Centcom! ERTs got fixed! 2015-03-29 03:54:54 +01:00
Fayrik
4f43fff199 Issue fixes! All that, and more! 2015-03-29 03:54:41 +01:00
NikNakFlak
89defc1d8b Adds the ability to shave all types of corgis, including ian, lisa, regular corgis, and corgi puppies. 2015-03-28 19:24:13 -07:00
phil235
a127c9403a Merge pull request #8553 from GunHog/Helmet_Fix
Fixes #8541
2015-03-28 23:35:19 +01:00
phil235
2ef01a61c5 Fixes alien nest not blocking the victim from instantly unbuckling. The victim now needs to click the nest or resist, then wait 2 minutes before being free.
Fixes alien nest buckling pixel offset.
Removes resist unbuckling 'success' message so there's not two unbuckling messages.
Fixes objects with buckling not unbuckling its buckled mob when the mob is gibbed (Fixes alien nest overlay not disappearing when larva burst and gib its host).
2015-03-28 23:02:44 +01:00
Sawu
3dc6a83198 Fix-it-Phil
Fixes the broken spacebbits
2015-03-29 06:17:25 +11:00
Swag McYolosteinen
eca852a8c1 Merge pull request #8569 from sawu-tg/easterevent
Easter is Out!
2015-03-28 19:32:49 +01:00
phil235
c67423adf5 Fixes alien humanoids not being able to attack blobs.
Created a take_damage() proc for obj/effect/blob.
Slight adjustment of the values of damage to blobs.
Fixes typo in pod people attack message (changed the verb from "slice" to "slash")
2015-03-28 19:27:07 +01:00
Swag McYolosteinen
bdfd2a2f7c Merge pull request #8554 from RemieRichards/MonkeyHats
Monkeys can wear hats!
2015-03-28 13:47:35 +01:00
ACCount12
55d4c99da4 Icon change 2015-03-28 22:27:23 +12:00
ACCount12
edace66c47 Fix 2015-03-28 22:15:20 +12:00
ACCount12
fd3f3ab68b New pins 2015-03-28 22:02:44 +12:00
phil235
e80a50f1c7 Fixes not being able to put unlit welding tool in open closets and not being able to open a closet with an unlit welding tool in your hand. 2015-03-28 00:12:06 +01:00
xxalpha
55b81363cc Merge remote-tracking branch 'upstream/master' into hardjet
Conflicts:
	code/modules/clothing/spacesuits/hardsuit.dm
2015-03-27 19:35:10 +00:00
Cheridan
cb23548768 Merge pull request #8533 from Jordie0608/greatpermitsbringgreatweightresponsibility
Fixes #8527, construction permit weight
2015-03-27 14:04:38 -05:00
hornygranny
8fba2cf22c Merge pull request #8551 from MrPerson/surgery_fun_removal
Disallow doing surgery on yourself
2015-03-27 11:52:00 -07:00