Commit Graph

1623 Commits

Author SHA1 Message Date
Cheridan
58bb48c758 Merge pull request #10662 from Fayrik/GotTooManyBranches
Massive Donksoft sale!!! Our prices cannot be matched!
2015-07-20 20:33:47 -05:00
Jordie
9da05b0878 Merge pull request #10578 from AnturK/pretty
Buffs Lightning Bolt
2015-07-21 05:40:12 +10:00
Cheridan
1c05fbcf6a Merge pull request #10450 from phil235/MechRefactoring
Mech code refactor
2015-07-20 02:00:11 -05:00
MrStonedOne
2f255406ac Gives the large portable scrubber 3x3 scurbbing power
Also fixes portable scrubbers a bit

Conflicts:
	code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
2015-07-16 20:13:02 -07:00
Fayrik
b83ea8a2ea Reduced cost of Donksoft weapons. 2015-07-17 01:05:18 +01:00
phil235
34db8dd695 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring
Conflicts:
	code/game/mecha/equipment/mecha_equipment.dm
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/game/mecha/mecha.dm
2015-07-16 13:50:01 +02:00
AnturK
2693a44a80 Buffs Lightning Bolt 2015-07-16 10:57:08 +02:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
MrStonedOne
2f9b4cd3f2 Removes gas mixture graphic overlay code, Moves all of that to turfs.
(also fixes conflicts)

Conflicts:
	code/LINDA/LINDA_turf_tile.dm
2015-07-15 00:44:01 -07:00
phil235
359a270de6 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring
Conflicts:
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha.dm
2015-07-14 01:20:37 +02:00
WJohn
37cfc11cd4 Merge pull request #10481 from Ikarrus/ganggangganggang
Gang Mode Update
2015-07-12 19:37:54 -04:00
Cheridan
7a02c71099 Merge pull request #10475 from phil235/BundleTypoFix
Fixes a typo in the traitor bundle's description.
2015-07-11 19:24:31 -05:00
WJohn
9b5badfd4b Merge pull request #10495 from Iamgoofball/patch-98
Due to recent shortages, justice helmets are more expensive
2015-07-11 20:22:43 -04:00
Remie Richards
648803f34d Merge pull request #10478 from Dorsisdwarf/uplinkplant
Lowers cost of Syndicate Encryption Key and Uplink Implant [balance]
2015-07-10 19:21:10 +01:00
Iamgoofball
e994f6c919 Due to recent shortages, justice helmets are more expensive
Space Justice Warriors have been attacking freighters carrying the Justice Helmets, and they have been in low supply recently, resulting in an increase of price for justice enforcer cfates. Reports from captured SJWs claim that the helmets offend them. Requests to ban the sale of justice helmets will be met with equally insulting responses.

- Nanotrasen Cargo Committee
2015-07-09 11:51:03 -07:00
MrStonedOne
a262f9aac7 Attack logging tweaks
Removed the "feature" to have something log in an atom's vv attack log, but not the file attack log. all attack log items will go to the file as well as vv.

Replaced all hard coded src.name/name for attack log's object argument with an actual object (src) except where it made more sense not to.

All attack logging *should* happen AFTER damage is applied now.

Removed the confusing attack entry for when a changeling stings another changeling.

Tweaked how punch attack logs worked
2015-07-08 23:14:37 -07:00
Ikarrus
7d0e61540c Gang Mode Update
- Fixes round-end message always declaring both gangs lost
- 3gang is now twice as likely to appear
- Purchased spray cans will always be the gang's color
2015-07-08 16:35:11 -06:00
Dorsisdwarf
d17bc9940d buffs uplinkimplant and syndiekey 2015-07-08 21:23:31 +01:00
phil235
75d6b11381 Fixes a typo in the traitor bundle's description. 2015-07-08 18:43:47 +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
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
fca65649ab Merge pull request #10402 from Ikarrus/ninjacodeayy
Gives the Capture objective a better description.
2015-07-07 07:48:26 -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
d1dd15e74e Merge pull request #10171 from MMMiracles/justicecrateinbound
Justice Enforcer Security Crate
2015-07-07 07:21:02 -05:00
Remie Richards
1fe4aee65e Merge pull request #10415 from Ikarrus/lizardnames
Random Names for Lizards
2015-07-07 03:24:55 +01:00
phil235
4689e00083 Merge pull request #10293 from spasticVerbalizer/wizarditisMessageFix
Fixes wizarditis messages
2015-07-06 19:24:50 +02:00
Ikarrus
d3ea1c7902 Fixed Badmins being able to exceed the gang limit with excessive button pressing 2015-07-06 00:05:59 -06:00
Jordie
fbe0cd2bb7 Merge pull request #10401 from Ikarrus/ganglastfixedition
Gang Update: Last Refactor Bug Edition
2015-07-06 14:58:45 +10:00
Ikarrus
5e50b2b982 Update and Changelog
Lizard names are now "name1-name2"
2015-07-05 22:20:00 -06:00
Ikarrus
792720848d - Reverted the change that made the traitor panel even harder to read
- Fixed a runtime with observers during pregame
2015-07-05 20:51:32 -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
Ikarrus
71a5543976 Nazism 2015-07-05 11:36:29 -06:00
Ikarrus
737783b084 Update 2015-07-05 00:32:13 -06:00
Ikarrus
3c6398bd46 Gives the Capture objective a better description.
Because what the fuck is a capture point?
2015-07-05 00:19:05 -06:00
Razharas
b42aa8238f Merge pull request #9816 from Sabbat/SabbatArmorRune
Armor rune updated to allow multiple choices based on what you are we…
2015-07-05 05:48:58 +03:00
Razharas
60a5a83757 Merge branch 'master' of https://github.com/tgstation/-tg-station into ChamFix 2015-07-04 22:31:18 +03:00
Razharas
38c2a54d9d Replaces magic number with define
Replaces magic number with define
2015-07-04 22:30:46 +03: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
Perakp
2b534cf5aa - Fixes shuttle loan events not bringing anything to the station. The objects created for the event were destroyed at Centcom.
- Removes supply order crates from shuttle loan events. These were pretty unintuitive, as you needed to accept the crates separately.
- Adds a new shuttle loan event: Centcom wants you to help in a virus research program. I feel this is a more controlled way of bringing diseases on the station compared to the disease outbreak event.
- Fixes camera failure event
- Fixes spanish flu, adds spanish flu culture bottle
2015-07-04 01:46:50 +03:00
Ricotez
4d91dbb9f0 Adds adminlogging for Toggle Purrbation. 2015-07-03 22:48:34 +02:00
Ikarrus
97b8286a00 Fixes some bugs introduced by Datum Gangs
- Fixes Quick-Create Gang button
- Fixes bosses unable to promote lieutenants
2015-07-03 12:37:52 -06:00
Cheridan
7b6867bc21 Merge pull request #10328 from Ikarrus/datumgangs
Datum-Based Gangs [Ready]
2015-07-03 10:35:07 -05:00
Razharas
b1bf4d04fe Merge pull request #10209 from Ricotez/human_mutantparts
Gives humans two types of mutant accessories: ears and (human-specific) tails.
2015-07-03 08:36:36 +03:00
Ikarrus
3814dc208a Gang-Based Datums 2015-07-02 22:18:11 -06:00
Razharas
572121ecc4 Merge pull request #10244 from Ikarrus/workplacesafety
Workplace "Accidents"
2015-07-03 05:05:36 +03:00
Ikarrus
25b134581b Resolved Conflicts:
code/game/gamemodes/gang/gang_pen.dm
2015-07-02 15:15:41 -06:00
Ikarrus
2191a2c33d Datum-Based Gangs 2015-07-02 15:12:55 -06:00
xxalpha
a405a14ab7 More better.
Some cleaning
2015-07-02 21:30:03 +01:00
xxalpha
4a86be4883 Merge remote-tracking branch 'upstream/master' into boxesofbananium
Conflicts:
	code/game/objects/items/stacks/sheets/mineral.dm
2015-07-02 18:49:41 +01:00
xxalpha
b2349384da Removed shit loop, fixed autolathe interface, removed debug msg. 2015-07-02 18:44:39 +01:00