Commit Graph

669 Commits

Author SHA1 Message Date
Tigercat2000
8c97846746 -tg- style inventory update, stripping update
This commit does the following:
 - Updates a few of our inventory procs to -tg-'s latest
 - Nukes the equip_e system from orbit
 - Fancy UI for stripping people now
 - Nuked fucking kitten ears from their snowflakey bullshit update_icons
   shitty fuck fuck FUCK
 - NUKED FUCKING METAL DETECTORS AHHHHHHHHHHHHHHHHHHHHHHHHHH
2015-10-04 16:53:48 -07:00
TheDZD
de8e5ecfd0 Merge pull request #2254 from Markolie/swordnborg
Syndicate borg update, add medical syndicate borg, energy sword refactor
2015-10-02 15:49:57 -04:00
Fox McCloud
5fe12d313a Merge pull request #2260 from Markolie/fixesfixesfixesfixesfixesfixes
Fixes
2015-10-01 19:43:05 -04:00
Markolie
f052512578 Fixes 2015-10-02 01:34:37 +02:00
Markolie
6bae20b0a0 Syringe gun update, borghydro update 2015-10-01 19:30:42 +02:00
Markolie
6f0a8174ad Guns rename, take two 2015-09-30 15:51:14 +02:00
Fox-McCloud
be672419ca Fixes a few Destroys 2015-09-28 18:15:39 -04:00
Tigercat2000
4b6a3ddcb6 -tg- SpaceMove update
This commit updates the spacemove system to -tg-'s; All objects now drift
in space, not just mobs. A few hardcoded space checks have been replaced
with has_gravity(); So it applies to zero-G as well as space.

Spacepods no longer drift, because their snowflakey shitcode just doesn't
work. So they just move.
2015-09-25 15:53:59 -07:00
Fox-McCloud
cf5bfcaac1 Telegun Refactor 2015-09-23 00:44:50 -04:00
Markolie
ea305d3ffa Saber SMG update, add armour piercing variable 2015-09-21 22:50:07 +02:00
Markolie
62235dc859 Wand and Thompson in-hands 2015-09-16 23:12:49 +02:00
Markolie
611cb16df8 Add torch, more in-hand fixes 2015-09-16 03:22:01 +02:00
Tigercat2000
c562680098 Merge remote-tracking branch 'origin/master' into bay_examine
# Conflicts:
#	code/game/objects/structures/displaycase.dm
2015-09-15 14:08:36 -07:00
Markolie
bbfc8f5c5b Remove another obsolete icon_override 2015-09-15 04:27:09 +02:00
Markolie
be5653a25f Get rid of item_override 2015-09-15 04:20:46 +02:00
Markolie
90f722d752 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom
Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm
	icons/mob/back.dmi
2015-09-15 04:18:27 +02:00
Tigercat2000
0603f73232 Bay12 examine overhaul.
This commit overhauls the examine system to baystation's latest system,
including a more efficient verb approach, and a new status panel tab,
which shows more information for pre-defined objects.
2015-09-14 11:51:40 -07:00
Markolie
2b74789b37 Burst fire tweaks 2015-09-14 04:39:39 +02:00
Markolie
591f2747ca Further gun updates 2015-09-14 04:36:41 +02:00
Markolie
f41f0a59fe Guns update 2015-09-14 04:05:20 +02:00
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