Markolie
8a3347523c
Purge Fahrenheit
2015-09-13 23:07:29 +02:00
Markolie
2cf27f9255
Get rid of two obsolete overrides
2015-09-13 23:03:16 +02:00
Markolie
ca6c7d10ba
In hand sprite overhaul
2015-09-13 22:44:18 +02:00
Markolie
aaeac981b9
Temperature gun update
2015-09-13 21:05:23 +02:00
Mark van Alphen
84b42c5491
Merge pull request #1986 from Fox-McCloud/nuke-and-tator
...
Nuke Ops and Traitor Update+Balance
2015-09-10 02:24:32 +02:00
Fox-McCloud
1c6c733a52
Nuke Ops and Traitor Update+Balance
2015-09-08 19:38:30 -04:00
Tigercat2000
be92665871
Replace magic intent words with defines, grab fixes
...
This commit does the following:
- Replaces all instances of magic intent words, like "harm" and
"help" with defines, I_HELP, I_DISARM, I_GRAB, I_HARM
- Fixes a few manual grab instances left over in attack_alien, they
will now used grabbedby()
2015-09-07 11:51:00 -07:00
Fox-McCloud
a019934e9e
Pass I
2015-09-04 05:18:48 -04:00
Tigercat2000
7f4ac72910
Progress bars + Wall Rationalization
...
This commit does the following:
- Ports progress bars from -tg- (tgstation/-tg-station#9921 )
- Refactors wall attackby code to make it 100% less insane; Instead of
manually checking every little thing, it uses do_after,
consequentially, making the new progress bars affect dealing with walls
as well.
Wall code makes a tiger sad.
2015-08-31 13:38:51 -07:00
DZD
0965789925
Fix merge conflicts
2015-08-21 18:38:42 -04:00
DZD
f3970fb304
Wizard touch attacks and fixes
...
- Flesh to Stone and Disintegrate are now actual touch attacks.
- Fixes issue with in-hands and back sprites missing for the staff of
animation.
- Fixes missing right-handed in-hand for the staff of healing.
2015-08-20 10:21:45 -04:00
Fox-McCloud
f89af99858
Merge pull request #1790 from Markolie/hosgun
...
Rename the head of security's energy gun
2015-08-19 17:05:17 -04:00
Markolie
3c66f779ef
Rename the head of security's energy gun
2015-08-18 21:52:05 +02:00
Markolie
8bede1db99
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace
...
Conflicts:
code/modules/mob/living/simple_animal/friendly/fox.dm
code/modules/organs/organ_alien.dm
2015-08-18 18:38:59 +02:00
Fox-McCloud
e618f79418
Merge pull request #1768 from Markolie/diona
...
Turn diona nymphs into simple animals
2015-08-17 21:34:46 -04:00
Fox-McCloud
333e7fe236
Merge pull request #1766 from Markolie/adminbus
...
Admin jump overhaul, add watchlist functionality, other admin updates
2015-08-17 18:10:38 -04:00
Markolie
766b0c979f
Turn dionas into simple animals
2015-08-17 02:19:29 +02:00
Markolie
5eee617063
Consolidate ?/FLW links under key_name_admin
2015-08-17 00:13:53 +02:00
Markolie
a397c730b5
Admin jump overhaul, add watchlist functionality, other admin updates
2015-08-16 23:28:02 +02:00
Markolie
4a14a97b3b
IPC overhaul part deux
2015-08-16 02:34:52 +02:00
Fox-McCloud
255dd726c5
Plasma Cutter Rebalance
2015-08-15 17:28:30 -04:00
Fox-McCloud
aa9cf52467
Changes View Range to Default of 15x15
2015-08-12 18:01:24 -04:00
DZD
68e8fb6162
Span changes
2015-08-09 19:23:49 -04:00
Mark van Alphen
b4c5e8bf6b
Mecha turret fix
2015-08-03 22:21:19 +02:00
DZD
fbaa994378
Mining Fixes
...
- Adds fire delay to kinetic accelerator and energy crossbow to prevent
an exploit that allowed rapid firing. This doesn't happen on -tg-'s
code, and the kinetic accelerators and ebow code are identical, so I'm
going to assume our gun code is to blame.
- Few mapping fixes on the asteroid to make sure the conveyor near the
northern mining outpost is powered, and that said outpost is no longer
open on its left side.
2015-07-30 19:02:28 -04:00
Markolie
660ffad9a0
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/modules/power/port_gen.dm
2015-07-30 03:08:33 +02:00
DZD
51eca017ad
Fixes based on feedback
2015-07-29 18:39:54 -04:00
Markolie
a60157fe5b
Make sure check trajectory works
2015-07-28 19:14:56 +02:00
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
