Commit Graph

14295 Commits

Author SHA1 Message Date
Thunder12345 8a780e89bf Overloading improvised shells
Improvised shells can be overloaded with black powder to have a random
pellet count and damage for each pellet. Damage ranges from 0 to 80.
2015-03-11 11:41:26 +00:00
Ahammer18 aa2cf3c469 Added drone asses 2015-03-10 20:35:11 -05:00
Xhuis 3bf0c7015a Replace some object verbs with alt-clicking 2015-03-10 21:28:13 -04:00
xxalpha 821a967986 Added Research designs for all implants. Added brain implant emp_act(). 2015-03-10 23:39:08 +00:00
phil235 5d5c21266c Merge pull request #8262 from MMMiracles/usaneverdie
Liberation Station 3: Patriotic Tears
2015-03-11 00:26:33 +01:00
Ahammer18 d2b650ad44 Changed "Toggle Suit Sensors" to "Adjust Suit Sensors" because we now have a menu that pops up when you want to change your suit sensors. 2015-03-10 18:20:14 -05:00
phil235 1eba7b694b Merge pull request #8134 from Miauw62/ghostradios
Adds a toggle so ghosts can hear radio chatter more easily.
2015-03-10 23:56:28 +01:00
xxalpha b2baa54a08 Added anti-stun brain implant. 2015-03-10 22:28:53 +00:00
phil235 cb96e65f1b Merge pull request #8254 from Steelpoint/HoSGunSpelling
[BALANCE]Buffs the Head of Security's Firearm.
2015-03-10 22:09:46 +01:00
phil235 60e152c54e slight adjustments.. 2015-03-10 20:43:21 +01:00
phil235 7ba8af5222 Fixes steel cap bug. Steel cap now growns steel logs similar to wooden logs, you use the hatchet to get rods.
Reorganizes all flashing to use the same mob proc 'flash_eyes()' (welding tool use, flashbang, flashers, laserpointers, etc).
Fixes making sandstone not stacking the result sandstones on the floor.
Sandstone, grass tile and carpet tile now look for other incomplete stack on their creation location to try to put them all in one stack (exactly like wood planks).
Fix typos.
Remove banglet var from all flashbangs, making flashbangs from clusters behave exactly like the other ones.
Renames eyecheck()proc to check_eye_prot() and moves it to mob/living level, elso creates check_ear_prot() for checking ear protection.
2015-03-10 20:30:46 +01:00
Miauw 09cf2e474f Reduces the taser firing delay. 2015-03-10 19:36:05 +01:00
Thunder12345 9723f6d092 Laser slugs + improvised shell fix
Adds laser slugs, fixes improvised slug recipe
2015-03-10 15:55:29 +00:00
MrPerson 692cfa4f1f Pulling icon en-speedening
Made the little pulling icon on the bottom right corner of your screen update right away when you start or stop pulling instead of updating as part of life(). Or Move().
2015-03-10 08:54:12 -07:00
Thunder12345 56ab83d4e7 Ion shell updates
Ion shell now acts as a shotgun of weaker ion bolts. Stronger than a
regular ion rifle when fired point blank, but suffers at longer ranges.
2015-03-10 14:42:08 +00:00
Thunder12345 a1a5edd314 FRAG-12, ion, improvised shotgun shells
Adds: Ion slug, ion rifle in a shotgun shell
Improves: Improvised shell, new sprite + recipe
Fixes: FRAG-12 slug, now with 100% more explosion
2015-03-10 13:57:54 +00:00
MMMiracles 552232496b typo fix 2015-03-10 09:18:12 -04:00
Steelpoint a5ba5972b4 AdditionalSpelling 2015-03-10 17:26:05 +08:00
Cheridan 72f465c864 Merge pull request #8138 from RemieRichards/BadminFuckingWithIcons
Clothing Icon File Admin Editing
2015-03-09 23:38:16 -05:00
MMMiracles 04a78be390 adds the freedom eagle, the only true friend a patriot can find within the region of socialist space. 2015-03-09 22:09:21 -04:00
dannno 040817ef61 adds a bunch of cosmetic glasses 2015-03-09 19:32:20 -04:00
Remie Richards 370a7100c7 Moves ninja shoes into the ninja folder 2015-03-09 23:02:26 +00:00
MMMiracles 1b1ee50b00 ASS BLAST USA USA USA USA 2015-03-09 17:50:37 -04:00
Remie Richards 751fb4aaa9 Adds SLOT_BACK for energy katana, makes energy katana call emag_act() on what it strikes (mirroring energy/blade functionality cleanly), Removes energy/blade hacks. 2015-03-09 21:48:45 +00:00
Remie Richards f6e4c1518d A restructure/removal/cleanup of Ninja Code 2015-03-09 20:43:56 +00:00
xxalpha 0f01378e7a Reworked suggested code, added brain implants, misc additions.
Fix missing ')'.

DELETE THIS
2015-03-09 20:39:09 +00:00
phil235 82b1b1adcd Merge branch 'master' of https://github.com/tgstation/-tg-station into DoughChange
Conflicts:
	icons/obj/food.dmi
2015-03-09 19:48:23 +01:00
phil235 bc091234ee Changes egg breaking to use reagent_containers/glass/attackby() (fix issue with custom egg salad)
You can only break eggs on glass containers (beaker,bucket,bowl,etc)
2015-03-09 19:43:39 +01:00
phil235 71d560bd3a Fixes a runtime with buckling screen alert
Fixes being able to buckle to janicart while crit and when there's a dense object on the janicart's turf.
Fixes alien nest not buckling and being wrongly pixel shifted, and fixed a runtime.
Fixes golems being super easy to weaken by punch and not doing more damage themselves via punch.
Fixes some typos.
2015-03-09 19:09:52 +01:00
Remie Richards d525fd6a87 Merge pull request #7872 from AnturK/hiss
Makes NPC queens/drones plant weeds/eggs
2015-03-09 14:27:55 +00:00
GunHog 97962ba59b Fixes "Sensor Augmentation" showing in silicon verbs
- Fixes #8167
2015-03-09 08:47:38 -05:00
phil235 4071f25270 Simplifies laser reflection code, no more reflect_chance var at the obj/item level. 2015-03-09 12:28:35 +01:00
Steelpoint 79857b0eac InitalCommit 2015-03-09 17:02:34 +08:00
Cheridan 564238f335 Merge pull request #8215 from Ahammer18/Ahammer18
Slime Cake
2015-03-09 02:35:18 -05:00
Cheridan b2d6abebb3 Merge pull request #8100 from Incoming5643/newbieguard
Adds a free pass to assistant for player accounts younger than two weeks
2015-03-09 02:29:09 -05:00
Cheridan fbab136950 Merge pull request #8016 from RemieRichards/EmbeddingBalance
Embedded Item Balancing. Also fixes #8029
2015-03-09 02:03:18 -05:00
Cheridan e846a6eeb4 Merge branch 'TheAnimalsTheyAttack!' of git://github.com/Sometinyprick/-tg-station into Sometinyprick-TheAnimalsTheyAttack!
Conflicts:
	code/game/gamemodes/wizard/spellbook.dm
	icons/mob/mask.dmi
2015-03-09 01:47:40 -05:00
Cheridan 5a6bacf139 Merge pull request #8073 from Xhuis/burn_this_message_after_you_read_it
Adds paper burning
2015-03-09 01:09:41 -05:00
Cheridan 7b6532ca79 Merge pull request #7984 from Incoming5643/farewell_to_shitty_slimes
Reworks the pink/light pink slime line to not be nearly worthless to breed
2015-03-09 01:03:21 -05:00
Cheridan 237f5c366a Merge pull request #8177 from MrStonedOne/patch-2
IsBanned() now rejects blank ckeys/ips/cids
2015-03-09 00:31:26 -05:00
Cheridan 0015d4c120 Merge pull request #8141 from Incoming5643/Subjectivity_is_a_bitch
Skipping mulligan antag based on Time/Subjectivity from admins + tweaks
2015-03-09 00:14:28 -05:00
Cheridan f4734de342 Merge pull request #8162 from Jordie0608/thisdrillwillnotpiercetheheavensbecauseithasbroken
Fixes #8148, Improves drill's handling of power
2015-03-08 23:41:50 -05:00
Cheridan 4dc830edc4 Merge pull request #8248 from Cheridan/master
Manual Merge of #7983
2015-03-08 23:30:17 -05:00
Cheridan 7ec6ad84cd Merge branch 'renamingandreskinning' of git://github.com/paprka/-tg-station into paprka-renamingandreskinning
Conflicts:
	icons/mob/back.dmi
2015-03-08 23:15:22 -05:00
Iamgoofball 855cf7c6b5 Fixes morphine to actually knock you out. 2015-03-08 20:50:09 -07:00
Cheridan bb066ae1ce Merge pull request #8210 from phil235/CoffeeOverdose
Changing Coffee jittering to be an overdose effect.
2015-03-08 22:18:32 -05:00
Iamgoofball e5a3694c0f Adds Napalm as a reagent and merges old napalm into Phlog. Fixes some foam stuff. 2015-03-08 19:43:17 -07:00
Incoming c9cc003c65 Explicitly passes a mobs mutant_color in blood samples 2015-03-08 20:55:36 -04:00
Cheridan 2bb7e317e4 Merge pull request #8186 from phil235/ghostburgerfix
Fixes ghostburger and appendixburger icons.
2015-03-08 19:44:12 -05:00
Cheridan 662caa554f Merge pull request #8205 from phil235/AlienDisposalFix
Fixes disposal climbing.
2015-03-08 19:41:08 -05:00