Commit Graph

14295 Commits

Author SHA1 Message Date
xxalpha ab1227625f Merge remote-tracking branch 'upstream/master' into smoothballs
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-07-08 00:43:02 +01:00
Incoming f136bf19a5 today I learned something new about in and how it interacts with logical operators 2015-07-07 18:56:35 -04:00
xxalpha 5a5372ed96 Repathed carpet, and other shit I forgot. 2015-07-07 23:01:13 +01:00
Ikarrus 3497744234 Makes it really obvious that antags no longer have objectives after being borged
Because people were confused by their memory being shown to them after the operation, which includes their objectives.
This also puts brains on a layer just above human mobs, so they can be seen when they pop out.
2015-07-07 15:11:53 -06:00
MrStonedOne 0828401db9 Prevents sentience potion from working on monkies
Logic: they can be converted to humans, this be too OP
2015-07-07 13:53:36 -07:00
phil235 1a0f0469e9 Merge pull request #10376 from Perakp/simpleAnimalEmoteSpam
Fixes hostile animal emote spam
2015-07-07 20:22:31 +02:00
phil235 ea1780ce97 - Mech equipment was using its unique processing method, with specific timing for each equipment, but now it uses obj processing, I
changed the values so the equipment effect stays the same. Remove global_iterator datum.
- fiddled with equip_ready procs of mech tools.
- removed mecha/proc/do_after and /enter_after() procs.
- Renamed mech sleeper occupant var to "patient" to avoid confusion with the occupant of the mech.
- all non instant tool (drill) now show a progbar when drilling etc..
- action cooldown now use do_after_cooldown() (that itself uses do_after) and start_cooldown (for instantaneous actions).
- Removed mecha_equipment's destroy proc, it's now all in Destroy(). No confusion.
- modified mecha_equipment/proc/can_attach() to not check istype(mecha) b/c it can't not be. (so the child only have one istype check.
- Removed diamonddrill/can_attach() , all done at drill level.
- armor booster now only for combat mech, instead of all except honkmech.
- Removed dynhitby, dynbulletdamage, dynattackby, dynusepower(), dyngetcharge(), dynabsorbdamage()
- I split the tools.dm file into smaller ones: work tools, mining tools, other tools.
- I split mecha.dm into mecha.dm, mecha_topic.dm and mecha_defense.dm
- refactored mech weapon ballistic/launcher, new proj_init proc, more OOP.
- Moving consumes energy! Lights consumes energy. Fixes #9425.
- Fixed #7354 xeno not bursting if host is inside a mech.
- Added action buttons to mech. Moved toggle lights, internal tank, eject, view stats from verbs to action buttons, these can now only

be done via these buttons (removed them from the big stats window).
- Removed port connect verbs b/C it's automated now.
- regular hud is no longer hidden when inside a mech (doesn't matter b/c you can't interact with most stuff in it while in a mecha). Fixes issue 10387
- can't walk when shooting projectiles. Makes walking on your projectile a bit harder. Helps against issue 10315 (but doesn't fix it).
- also made into action buttons: the special abilities of certain combat mechs.
- Added thrown alerts for mech charge and integrity.
- Fixes teleporting occupant out not properly removing it from the mech. Fixes issue 10330
- fixes ballistic mech weapons spinning when launched. proc/throw_at() now has a spin argument instead of using var/allow_spin that was added to all atoms just for that.
- added a update_action_buttons() to ai/life() to handle ai mech.
2015-07-07 19:40:32 +02:00
GunHog 7d744fa7de Fix for request console emergency runtime
- Fixes 10441
- Ensures that any span changes set forth by NTSL scripts are valid
lists with allowed values, preventing runtimes.
2015-07-07 11:02:44 -05:00
Cheridan c72c44bc18 Merge pull request #10426 from Ikarrus/shredreduction
Removes light blasts shredding clothes
2015-07-07 09:53:40 -05:00
MrStonedOne b56648205f Removes privacy poll, part2: newplayer/login.dm 2015-07-07 07:01:27 -07:00
MrStonedOne a4d3c887be Removes privacy poll, part1: poll.dm 2015-07-07 06:58:46 -07:00
Cheridan 65484c6457 Merge pull request #10419 from Ikarrus/gangbadmin
Fixed Badmins being able to exceed the gang limit with excessive buttons
2015-07-07 08:57:30 -05:00
Cheridan c286b1710d Merge pull request #10360 from Perakp/cargoVirusEvent
New shuttle loan event + fixes
2015-07-07 07:42:08 -05:00
Cheridan 54754c52a9 Merge pull request #10407 from nullstation/hi-extended-patch
Improvements to crew monitoring computer
2015-07-07 07:12:08 -05:00
Incoming 36e9d976c5 removes some yet unneeded code to make mutant race color selection work again 2015-07-07 02:26:28 -04:00
Ikarrus 9d92933bea Staff of change now assigns lizard name when appropriate 2015-07-06 22:04:05 -06:00
Ikarrus a949c80fee Fixes Race Swap Runtime
- Fixes Race Swap Runtime
- Staff of change now assigns lizard name when appropriate
2015-07-06 21:47:30 -06:00
Remie Richards 1fe4aee65e Merge pull request #10415 from Ikarrus/lizardnames
Random Names for Lizards
2015-07-07 03:24:55 +01:00
Ikarrus b1d8d049c1 Renames duplicate random_name() proc 2015-07-06 20:15:47 -06:00
Ikarrus 75578aa69d Removed Shredding for light blasts 2015-07-06 16:45:21 -06:00
phil235 1218d8a9f6 Merge pull request #10292 from spasticVerbalizer/disposalSanityCheck
Adds sanity check to disposal climbing
2015-07-06 19:25:43 +02:00
Ikarrus 472f973cac Reduces the chance of your clothes getting shredded with light blast damage 2015-07-06 08:27:52 -06:00
Jordie0608 52acb19a55 custom range and changelog 2015-07-06 23:46:21 +10:00
Jordie0608 973683b8bf local narrate verb 2015-07-06 23:22:01 +10:00
Ikarrus d3ea1c7902 Fixed Badmins being able to exceed the gang limit with excessive button pressing 2015-07-06 00:05:59 -06:00
Ikarrus 5e50b2b982 Update and Changelog
Lizard names are now "name1-name2"
2015-07-05 22:20:00 -06:00
Ikarrus b0cfaf401f Random Names for Lizards
Lizards now have their own list of names to pull from when randomizing their names.
2015-07-05 18:35:56 -06:00
Remie Richards 513b589d80 Merge pull request #10389 from Razharas/PinFix
Fixes pin removal having no category
2015-07-06 00:31:43 +01:00
Razharas 126b9e1b10 Merge pull request #10329 from RemieRichards/FixToolTextTablecraft
Fixes Tablecraft Tool Spam
2015-07-05 23:17:59 +03:00
NullQuery 10109d134f - Fixes sorting on the crew monitoring computer. Items will now sort as they have before, based on the department and job.
- Hovering over a dot on the map will now scroll to the applicable person in the table.
- Patch for interactive mobs (sNPCs) to properly set assignments on their ID's.
2015-07-05 13:15:20 +02:00
Steelpoint 1e727e34eb BulTo40 2015-07-05 19:05:09 +08:00
kingofkosmos 1c52df23b5 Merge branch 'master' of https://github.com/tgstation/-tg-station into beakerdrink
Conflicts:
	code/modules/reagents/reagent_containers/glass.dm
2015-07-05 10:14:33 +03:00
Razharas 3cf25b4be0 Fixes pin removal having no category 2015-07-05 01:38:40 +03:00
Razharas 6fad4d1df8 Merge pull request #10271 from Cheridan/red_faction
Removes Access Restriction on Mining Shuttle Console
2015-07-05 00:21:58 +03:00
Cheridan e4a3372a7f Merge pull request #10257 from Razharas/ChamFix
Fixes chameleon mutation
2015-07-04 16:08:17 -05:00
Cheridan 13d0fcc9e9 Merge pull request #10261 from Razharas/FridgeFix
Fixes smartfridge construction and deconstruction
2015-07-04 15:42:35 -05:00
Razharas 60a5a83757 Merge branch 'master' of https://github.com/tgstation/-tg-station into ChamFix 2015-07-04 22:31:18 +03:00
Perakp b1196d89fb - Readded the department resupply event and the supply crates for the other events. 2015-07-04 21:30:20 +03:00
Cheridan 96ff8ab617 Merge pull request #10265 from Razharas/PinRemoval
Added pin removal recipe
2015-07-04 12:50:11 -05:00
Steelpoint 2780f62ec9 CollapsingIntensifies 2015-07-05 01:23:19 +08:00
Cheridan 798f05e4a6 Merge pull request #10272 from Razharas/DarkClick
Fixes clicks in darkness
2015-07-04 12:17:10 -05:00
Cheridan c9c2e90acb Merge pull request #10268 from GunHog/Ore_ID
Ore Redemption Machine ID improvement
2015-07-04 12:10:56 -05:00
Remie Richards 97504c2d0b Merge pull request #10337 from Ikarrus/beakertransferfix
Fixes Beakers unable to transfer their reagents to other objects the mob is holding
2015-07-04 17:00:07 +01:00
Ikarrus 588dcfebef More fixes and changelogs 2015-07-04 09:40:24 -06:00
Swag McYolosteinen b25767b33f Merge pull request #10335 from Ikarrus/bombcover
Fixes clothes not protecting underlaying clothes.
2015-07-04 17:24:59 +02:00
Swag McYolosteinen b649c11bc6 Merge pull request #10314 from RemieRichards/MoreAttackAnimations
More Attack Animations
2015-07-04 17:22:24 +02:00
Swag McYolosteinen 4d3d4be753 Merge pull request #10353 from Ricotez/catfix
FIX for randomly spawning with cat parts.
2015-07-04 16:58:56 +02:00
Swag McYolosteinen a4b60449f8 Merge pull request #10129 from AnturK/ayy
Abductors fixes and improvements
2015-07-04 16:57:10 +02:00
Ikarrus 38dc0890c8 Spillable var instead of checking for OPENCONTAINER as that flag encompasses a lot more than necessary. 2015-07-04 08:54:04 -06:00
Perakp d6405a0051 - Reduces emote spam of some hostile simple animals.
- Removes a near-duplicate proc LostTarget (kept LoseTarget).
- Adds punctuation to some simple animal emotes.
2015-07-04 15:37:00 +03:00