Commit Graph

952 Commits

Author SHA1 Message Date
Joan Lung
c9ada5cea3 Merge pull request #23214 from KorPhaeron/megafauna
Megafauna won't heal while on station
2017-01-24 10:23:04 -05:00
Kyle Spier-Swenson
12570805bd Closes the Pool. (#23150)
* Delete pool.dm

* Removes usage of PoolOrNew

* Wrap up
2017-01-22 16:00:23 -05:00
KorPhaeron
e35a1d18b4 Typo Fix 2017-01-21 12:24:03 -06:00
KorPhaeron
9fff5ab55f Blood Contract 2017-01-21 12:09:04 -06:00
Mervill
5634779eee Using a welder to repair a mining drone now follows standard behaviour (#23032)
* using a welder to repair a mining drone now follows standard behaviour

* cost tweak

* You now get welding glasses with the mining drone when you redeem the mining voucher
2017-01-17 21:19:15 +01:00
Militaires
980411b961 Refactors riding to a datum and applies it to vehicles, allowing for mobs to be ridden. (#22420)
* sleepight pupper

* boop

* boom explosion habbon

* wew ladder.

kor tell me the varname cock tobbagan dont just tell me it exists and you dont poin

* bambi in spess

* more shitfuck

* GOD DAMMIT ITS GONNA BE FUCKING HOT AAA

* commit this dick you fucking tub

* GIGANTIC REFACTOR 2.0

* OH YEAH THE CREAM RISES TO THE TOP

* antur

* aaaaaa

* boat

* wew ladder

* bman

* yaaaaaaaaaaaaaaaaaaawwwwwwwwwwwwwwwwwww

* STEEL CORRIDOR
2017-01-16 19:02:42 +01:00
Cyberboss
de454f5a35 The real slips rewrite (#22490)
* Fix a bug in forceMove

Don't call Exited/Entered if the loc is the same

* Added forced_movement

* Remove usages comment

Fixed a parameters bug

* Refactor slips

* Refactors meathook

* Negative check

* Shittier syntax, more performance

* Seperation of src and args

* Sanity check

Because you know someone will fuck it up

* X to Y is inclusive

* Bettter diagonals

* Remove unused var

* Better suggestion

* This was never used, why was it here?

* Arg prefixing...

* Better cleanup

* Do not touch the self managing var

* Cleanup

* More cleanup

* Missed 2

* Added callbacks

* Fix ice again

* Sanity checks

* Applied to larva/attack_hulk

* Fix the chain's usage

* LDFJAHDJKAGFHLJKDSAGHJKLSDAGBLKJADGFHKLJADGNLKAMDFNBJK:ANFDJKLADSNLSJKDFHNASFADSFLK:AJFL:KASJFKLASJF:LAJSF:LKJASKFMSALKF
2017-01-12 13:57:23 +13:00
Jack Edge
6a7c98695f Tiny mining equipment changes
- Resonators now check when rupturing for local air pressure to
determine damage
- Made basic mining scanners use addtimer()
- Tweaked the descriptions of resonance and resonator

I was trying to fix #22878 but I couldn't reproduce the bug, and ended
up making these changes anyway.
2017-01-09 15:34:01 +00:00
oranges
3a77966186 Merge pull request #22728 from XDTM/MechHole
Fixes wormholes not being usable by mechs
2017-01-06 09:58:29 +13:00
Firecage
8dab2c9c34 Changes the names of Circuit Boards so they are easier on players. (#22688) 2017-01-04 17:20:53 -05:00
XDTM
babe7a6aa6 Fixes portals not being usable by mechs 2017-01-04 15:56:50 +01:00
Kyle Spier-Swenson
bee4b132a3 [READY]Makes addtimer use callbacks (#22660)
* Makes addtimer use callbacks

* I broke the comment

* I fucked up the regex

* this was a silly idea.
2017-01-04 16:02:56 +13:00
Joan Lung
36eeb75770 Indestructible turfs are no longer affected by necropolis tendrils or the lava staff (#22641)
* Indestructible turfs are no longer affected by necropolis tendrils or the lava staff

* a better proc name
2017-01-04 07:59:39 +13:00
KorPhaeron
010f305ee2 Fixes portals moving anchored atoms (#22587)
* Fixes portals moving anchored objects

* Missing a letter

* Mecha
2017-01-02 15:07:11 +01:00
oranges
078e9ff97f Merge pull request #22593 from Firecage/The_Hooded_Hoods
Fixes hoods dropping when suiciding/being beheaded.
2017-01-02 02:14:02 +13:00
Firecage
2f4711ea6d Changes how hoods of hooded clothing functions...kinda. 2016-12-30 13:34:10 +02:00
bgobandit
e9544b8bec Fixes spelling and misleading messages (#22512)
* Fixes spelling and shit

* satiates the kor, fixes more typos/grammar issues

* spelling madness

* I'm mad with spelling power
2016-12-29 10:14:01 +13:00
Joan Lung
2c39711ab5 New Hierophant sprites (#22404)
* New Hierophant sprites

* actual boss sprites: MAYBE

* byond does not actually catch this error

* anomaly

* I'm a sucker for stupid-ass puns
2016-12-26 19:30:37 -05:00
bgobandit
f64e3f8688 Adds a sprite for a survival pod fridge with the panel open (#22375)
* Adds a maintenance panel to the survival fridge panel, will probably need to be fixed

* I'm a goddamn clairvoyant (fixed)
2016-12-23 09:38:46 +13:00
coiax
2f521b1f5f Ore satchel auto empties into ore box when dragged (#22228)
🆑 coiax
add: Whenever you automatically pick up ore with an ore satchel, if you
are dragging a wooden ore box, the satchel automatically empties into
the box.
/🆑

Because convinience. Streamlining. Less pointless clicking.
2016-12-18 19:53:27 +13:00
XDTM
7d1a67d0c8 Abductor tools and tool sound refactor. (#22125)
* Everything in the PR

* I'm taking that as a yes
2016-12-14 18:09:41 +13:00
Joan Lung
a3be7a9226 Refactors toolspeed to be a multiplier instead of a divisor 2016-12-09 16:55:51 -05:00
Kyle Spier-Swenson
dedb16826e Speeds up world init. (93s -> 49s) (#21992)
* Speeds up world init.

* Armor is now new inited for obj and the first level of subpaths.
* Actions is now lazyinited and deleted with empty.
* Actiontypes is now only inited when actually used and deleted once it pre-fills actions with the action buttons.
* Pipes now prefill their node list(s) in new() using new /list/ (count) syntax to speed up the list initaliztions and remove the init proc.
* Pipes no longer store their item version, instead creating it on the fly when deconned
* Walls no longer store their metal stacks, instead creating it on the fly when deconned.
* obj, walls, floor, plating, item, machinery, structure, pipe, pipenet, atom, and movable no longer have an (init) proc. (along with a few other smaller examples)
* Atmos can pass checking is now a var with the ability to have a proc be call in advance cases.
  * (as a side effect, I had to fix a few things that were calling atmosCanPass rather then using the pre-calculated list, this should speed up chemfoam and flame effects greatly)

* Reverts upload limit
(remind me one day to defuck this, it could easily be a config thats not editable by vv to make changes easier)

* Makes apc update icon a bit faster.
APC new is some what high on the profile of world init, still not sure why, but this stood out as a waste of cpu so i fixed it.

* Fixes runtime with atmos backpack water tanks.

* Makes smoothing faster (and fixes turfs smoothing twice at init)

* Makes apcs init faster by replacing some spawns with addtimer

* fix transit turfs.
2016-12-08 21:50:15 +13:00
Mervill
0972f78800 a_intent now uses defines 2016-12-02 22:27:30 -08:00
Mervill
c2e2440953 Merge branch 'master' into w_class
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
2016-12-02 21:44:24 -08:00
Jordie
ca6ffdba40 Merge pull request #21866 from Mervill/slashes_deux
Remove slash from end of type refs/defs
2016-12-03 15:56:10 +11:00
Mervill
09ea5ad2e5 w_class now uses defines 2016-12-01 21:33:14 -08:00
Joan Lung
a5ae025549 Replaces "specflags" with "species_traits" (#21851)
* Replaces "specflags" with "species_traits"

* this will do
2016-12-01 21:16:33 +13:00
Mervill
01d4232570 Remove slash from end of type refs/defs 2016-11-30 19:23:15 -08:00
oranges
af7e6d1323 Fixes all remaining addtimers missed 2016-11-27 08:31:07 +00:00
oranges
54beec00e8 Merge pull request #21694 from KorPhaeron/mining_with_friends
Adds the mining conscription kit, go mining with your metafriends
2016-11-26 15:19:34 +13:00
Mervill
70256e9f8a Removes some stale comments (#21700)
* Stale comments and some redundant string interpolation
2016-11-24 13:27:41 -06:00
KorPhaeron
22e2db3888 Adds the mining conscription kit 2016-11-22 20:01:49 -05:00
oranges
f12a75f2cf Merge pull request #21616 from KorPhaeron/fireproof
Adds missing fire proof status to some items (Mining suit and paranormal hardsuits)
2016-11-20 14:54:02 +13:00
oranges
b5e898ce4c Merge pull request #21615 from KorPhaeron/dragon_form
Changes to drake transformation
2016-11-20 14:52:46 +13:00
KorPhaeron
627f1243a3 Adds missing fire proof status to some items 2016-11-17 22:15:00 -06:00
KorPhaeron
79636a23e6 Dragon Form 2016-11-17 22:02:09 -06:00
Joan Lung
f162d4d84a Refactors scripture quickbind (#21563)
* Refactors scripture quickbind

* =
2016-11-17 12:28:57 +13:00
Arianya
29b597f789 Added a logging override for crusher
Consistency with the KA as well as de cluttering logs.
2016-11-11 15:05:15 +00:00
Mervill
9ea955b85f Lint (#21393)
* icon, icon_state defined twice

* desc defined twice

* desc defined twice

* desc, icon_state defined twice

* icon_state, name defined twice

* item_state defined twice

* gender defined twice

* stop_automated_movement_when_pulled defined twice

* attacktext defined twice

* speak_emote defined twice

* flying defined twice

* item_state defined twice

* speak_chance defined twice

* attack_sound defined twice (x2)

* icon_state, item_state defined twice

* icon_state defined twice

* Revert "desc defined twice"

This reverts commit 18d74f442441078a7d8e8cfaddbef1c4646b6bb9.

* desc defined twice

* Revert "desc defined twice"

This reverts commit e167c0812c94a96dfb3f6888c77cee868cc37c03.

* desc defined twice
2016-11-08 13:55:30 +13:00
kevinz000
5bf5426f4a Update mine_items.dm 2016-11-05 17:22:01 -07:00
kevinz000
bda1dda20e Update mine_items.dm 2016-11-05 17:21:49 -07:00
kevinz000
f1ee75b18b Update mine_items.dm 2016-11-05 03:05:29 -07:00
phil235
b7efc2cef4 Make energy guns able to use burst fire. (#21005)
* Make energy guns able to use burst fire.

* Changed obj/item/weapon/gun/projectile to /gun/ballistic and the name of the folder from "projectile" to "ballistic" to avoid confusion between actually projectiles and guns.

Syringe gun, energy guns and magic guns can now use burst fire.

* fixing merge conflict shit

* fixing map conflicts

* more map conflict fix

* two tiny fixes.

* tiny tweak

* fixing merge conflicts.
Moving the practice mini egun to the gun module.
Renamed nuclear.dm to energy_gun.dm

* map conflict fixes
2016-11-02 16:16:21 +13:00
phil235
2dc956bea0 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
# Conflicts:
#	code/game/gamemodes/clock_cult/clock_scripture.dm
#	code/game/gamemodes/clock_cult/clock_structures.dm
2016-10-31 19:59:00 +01:00
chowdermcarthor
c7e474ccae Neck Slots (#21169)
* Added in a neckslot. Moved some tie items over to said neckslot.

* Changng some stuff to fix the new neckslot items.

* no message

* Altered comment to say that the old tie system is being kept as-is due to armbands and such instead of just avoiding conflicts.

* no message

* Changed the number for this.

* Fixed jaws of life not having a category, thus they only would show up when searched.
2016-10-26 19:03:41 +13:00
Kyle Spier-Swenson
ca14ec7a70 Fix Spectral Blade not counting orbiting ghosts correctly
I forgot that I made orbiters store orbit datums, not the atom orbiting.
2016-10-22 13:32:29 -07:00
Screemonster
60180cb0fd Makes the antitamper mechanism prevent tampering 2: electric boomaloo (#20893)
* Sanitises input on abandoned crates

* Makes anti-tamper mechanisms detect tampering.

* Makes explosion trigger on take_damage() instead.
2016-10-21 15:30:46 +13:00
AdamElTablawy
5b2bedcb51 adds cargo and engi access to allowed accesses for launching mining aux base (#21048)
* cargo, engi, and head access added to aux mine base

* FUCK
2016-10-21 15:14:47 +13:00
phil235
1ce672c630 fixing stuff about atom_colours. 2016-10-21 01:30:42 +02:00