Markolie
c67bb095fb
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
2015-07-28 18:40:44 +02:00
Markolie
1e20f58e5c
Turret fixes
2015-07-28 18:40:26 +02:00
DZD
d64568e309
Adds the can_charge var to energy guns
...
If set to 0, makes it so the gun cannot be charged in recharges. Set to
1 by default, only the nuclear (AKA advanced) egun and both plasma
cutters have it set to 0. (Nuclear egun was previously unable to be
charged, but used an istype check specific to it.)
2015-07-24 16:02:13 -04:00
DZD
66688f4dbb
Fixes conflicts in icons/obj/gun.dmi.
2015-07-24 15:29:20 -04:00
Fox-McCloud
0524d49ff3
Fixes Unlimited Bullets
2015-07-17 19:36:14 -04:00
DZD
3ed90434e0
Projectile, borg, and RnD fixes.
2015-07-10 21:36:23 -04:00
DZD
412443dbf1
Fix non-icon merge conflicts
2015-07-10 19:57:59 -04:00
DZD
d4cf433e7c
Various fixes, changes, additions, and removal of old features.
...
More changes
2015-07-10 19:41:27 -04:00
Fox-McCloud
54f59b9899
Pass II
2015-07-09 19:51:40 -04:00
DZD
916f9bf4bb
Sort of compiles
...
Time to fix xenoarch, and then the map.
2015-07-09 15:55:36 -04:00
Fox-McCloud
0dbea7621f
The Great Del() Cull of 2015
2015-07-09 02:48:34 -04:00
Fox-McCloud
0e8619a202
Destroy Pass III
2015-07-08 03:39:52 -04:00
Fox-McCloud
6e87b96501
Pass 3
2015-07-08 01:34:53 -04:00
Fox-McCloud
88dfaa51a4
Replaces Reamining Del()'s
2015-07-07 00:35:19 -04:00
Tigercat2000
3a45d52fe0
Fix remaining non-returning Destroys()
...
Plus a little refactor to mining flaps and spacepod doors- they now use
CanAtmosPass instead of manually setting the turf to no-atmos-passing
2015-07-06 09:20:39 -07:00
TheDZD
b38d741801
Merge pull request #1446 from Fox-McCloud/pools-and-fires
...
Pools Hotspots
2015-07-05 17:51:20 -04:00
TheDZD
59b154e8cb
Merge pull request #1452 from Fox-McCloud/parents-and-procs
...
Tweaks a Few Destroy()'s
2015-07-05 17:51:03 -04:00
Fox-McCloud
44881a4016
Tweaks a Few Destroy()'s
2015-07-05 04:51:47 -04:00
Fox-McCloud
6610d71dd7
Fixes Emitter Beam Pooling
2015-07-04 20:59:12 -04:00
Fox-McCloud
a878ccee30
Pools Hotspots
2015-07-04 09:34:03 -04:00
Tigercat2000
bcb4a9601f
Merge remote-tracking branch 'upstream/master' into poolit
...
Conflicts:
code/game/objects/structures/displaycase.dm
code/game/objects/structures/grille.dm
code/game/objects/structures/lamarr_cage.dm
2015-06-22 13:40:07 -07:00
Tigercat2000
f916eb7e2d
Fix a few ex_act's.
2015-06-21 18:40:00 -07:00
Tigercat2000
7c9139d6e0
Bay/-tg- Meteor port
...
Meteors now have different types, properly integrated.
Meteoract has been removed, meteors now just call ex_act.
2015-06-21 18:39:39 -07:00
Tigercat2000
d20298e996
-tg- atom pooling system, qdel changes
...
This commit first and foremost ports the -tg- atom pooling system, and
removes the old experimental system entirely.
Secondly, this PR modifies the qdel system to use a -tg- lookalike
"destroy hint" system, which means that individual objects can tell qdel
what to do with them beyond taking care of things they need to delete.
This ties into the atom pooling system via a new hint define,
QDEL_HINT_PUTINPOOL, which will place the atom in the pool instead of
deleting it as per standard.
Emitter beams are now fully pooled.
Qdel now has semi-compatibility with all datum types, however it is not
the same as -tg-'s "Queue everything!" system. It simply passes it through
the GC immediately and adds it to the "hard del" lists. This means that
reagents can be qdel'ed, but there is no purpose as of yet, as it is more
or less the same as just deleting them, with the added effect of adding
logs of them being deleted to the garbage collector.
2015-06-21 15:47:57 -07:00
Fox-McCloud
93392f8e90
Explosion Rework
2015-06-20 04:13:55 -04:00
ZomgPonies
bb02973e49
Merge pull request #1288 from Fox-McCloud/singularity-OOP
...
Singularity and Narsie Refactor
2015-06-13 04:18:40 -04:00
Fox-McCloud
e203a7d17f
HoS Lasergun Fix
2015-06-13 03:53:07 -04:00
Fox-McCloud
2ad1c74457
Singularity Refactor
2015-06-10 20:04:28 -04:00
Krausus
1389f0eb9b
A couple istype->ishuman replacements
2015-06-10 11:02:54 -04:00
Krausus
a67021784f
Fixes issues with change projectiles
...
Fixes dropping organs/limbs, cyborgizing runtimes, transfer of
non-wizard spells, transformation attack logging, and transformation
into unintended species
2015-06-10 09:29:13 -04:00
Krausus
94c2c3cca2
Removes two old/unused/redundant magical projectiles
2015-06-10 07:45:05 -04:00
ZomgPonies
9119f1fd08
Merge pull request #1265 from veganzombeh/powergloves
...
Fixes power gloves lightning not calling bullet_act.
2015-06-07 14:12:17 -04:00
veganzombeh
1c58d700c5
Fixes power glove lightning not calling bullet_act.
2015-06-07 13:11:56 +01:00
Fox-McCloud
07e1ef0e82
tweak
2015-06-07 00:54:59 -04:00
TheDZD
38d3eeaa31
Merge pull request #1206 from ZomgPonies/piecannon
...
Adds Piecannons to HONKsquad
2015-05-29 17:41:18 -04:00
ZomgPonies
8bfc376886
Add pie cannons to HONKsquad
2015-05-28 17:44:56 -04:00
Fox-McCloud
5d3e837b4a
Mob Refactor+Update and Pet Collars
2015-05-28 00:20:25 -04:00
ZomgPonies
5c79a9a065
Small object manipulation stuff
2015-05-26 14:00:20 -04:00
ZomgPonies
fa5e97deb5
Missing dmis, final fixes
2015-05-25 20:35:35 -04:00
ZomgPonies
1935a82afe
2/3 of port done
2015-05-25 19:48:13 -04:00
ZomgPonies
bd71606cf6
Merge pull request #1010 from tigercat2000/GAAB
...
Generic Action/Action Button System
2015-05-12 14:35:36 -04:00
ZomgPonies
f22ae3acbe
Merge pull request #998 from tigercat2000/LightShit
...
Baystation12's Lighting Overhaul
2015-05-11 17:06:30 -04:00
AnturK
568d289a67
Generic Action\Action Button System
...
This commit ports the GAABS from -tg-station13. The GAABS allows for
generic, movable, hud elements for spells, powers, and items.
2015-05-11 09:32:08 -07:00
ZomgPonies
6fe5db524a
Fixes reflecting projectiles
2015-05-10 20:10:27 -04:00
Tigercat2000
e1249fc640
Lighting overhaul.
...
This commit overhauls the lighting system to Bay12 standards. It is better
in pretty much every way.
2015-05-10 12:03:27 -07:00
ZomgPonies
6dfb4a732d
Finally done
2015-05-09 07:12:54 -04:00
ZomgPonies
a05e70585e
Fixes
2015-05-08 17:59:42 -04:00
ZomgPonies
cb0a65b96f
Let's try this
2015-05-08 17:32:34 -04:00
ZomgPonies
d106462fa5
Merge pull request #796 from TheDZD/shadowling
...
Port of /tg/station's Shadowlings [WIP]
2015-05-04 20:38:20 -04:00
TheDZD
cdd8309827
Merge pull request #910 from Fox-McCloud/projectile-fix
...
Fixes Projectile Effects
2015-04-30 18:30:35 -04:00
