Commit Graph

1258 Commits

Author SHA1 Message Date
eswordthecat
13953f9525 Properly remove fax to machine list (default remove on unoverriden proc). 2015-01-22 12:39:36 +08:00
D3athrow
71a0220e55 Eyy lets defer damage icon updates until the next life tick! 2015-01-16 23:54:54 -06:00
eswordthecat
6a40cc4215 Merge remote-tracking branch 'upstream/Bleeding-Edge' into patch-200 2015-01-15 04:44:26 +08:00
eswordthecat
764d01dc3e e65919da42 2015-01-12 15:42:50 +08:00
ComicIronic
e1bbc5bb08 MERGE CONFLICTS. 2015-01-11 17:32:02 +00:00
ComicIronic
57cf932a54 Merge conflicts. 2015-01-07 16:38:06 +00:00
Unfit
5d834b308d bugfixes
fixed poker table sprites looking bad (haven't tested yet so there still
may be some shading issues)
fixed poker tables mysteriously disappearing on construction
fixed glass stacking with plasmaglass
fixed being able to walk on solid objects built on tape
2015-01-07 16:16:43 +01:00
ComicIronic
9c9e1ff808 Removed the TABLEPASS flag.
No longer in use in any of the code.
Also changed cases of flags being set to null instead of 0.
2015-01-03 18:33:47 +00:00
ComicIronic
e93acf366c More line reduction, message spam for rwalls removed. 2014-12-27 11:59:08 +00:00
ComicIronic
29a039c03a Code rework of placing things on walls.
Stuff goes under types.
Types have procs.
Never have 500 lines of repeated code again.

I came very close to crying while editing this. You should appreciate that.
2014-12-27 00:06:38 +00:00
ComicIronic
5e5bbf03fd Removed the CONDUCT flag.
Use Siemens, you dolts.
This is the start of completely redoing the flag system, but it starts with removing these oldcode flags.
2014-12-26 18:13:52 +00:00
Rob Nelson
622f330a22 Nerf Firebird
- Firebird can no longer go through walls (server vote 10-7)
 - Firebird now leaves fire trails in space.
 - Slightly re-organized jetpack code.
2014-12-16 18:46:06 -08:00
DeityLink
5f8f657773 PDA update fixing 2014-12-10 03:52:12 +01:00
ComicIronic
db4a33166c Fixed welding down machines.
Added the state var to all machines. 0 is unanchored, 1 is anchored, 2 is welded.
Added the WELD_FIXED flag for machines that can be welded down.
Added the weldToFloor proc, which is used to toggle welding down for machines.
Fixed machines not using general procs.
Fixed some relative pathing.
2014-11-12 19:10:11 +00:00
DeityLink
7c5823bcce removing pod fabricator access req 2014-11-10 04:02:54 +01:00
ComicIronic
534e1c0ebe Fix merge conflicts. 2014-11-01 21:58:28 +00:00
d3athrow
9038da6df1 Merge pull request #1815 from dylanstrategie/SCP-Fix
Fixes to SCP-173 behavior
2014-10-31 18:07:00 -05:00
dylanstrategie
3acf1eca35 Fixes to SCP-173 behavior
I have decided to release the fixes outside of other SCP-related plans
for Halloween. Maybe more adminbuse will occur this way

- SCP nows stuns and paralyses as soon as he gets a grab, and not after
a huge list of fluff. This ensures you can't lag-walk your way out of
his grab forever. At least it should
- Attempt fix to SCP's sight code. Now he should ALWAYS count himself as
observed if someone is facing him, instead of weighting odds like a
drunkard and ignoring non-direct sight 90 % of the time
- Save up one indent level by returning Life() code after sight check if
we have observed
- Fix error caused by trying to get a vent's name, and foolproof it in
general. No need to know SCP went through the Bar Air Vent 2

This should do for now. If any more bugs show up, warn me
2014-10-31 23:57:41 +01:00
Chris
8a3e9b2428 Merge remote-tracking branch 'origin/Bleeding-Edge' into bay_hydro_port
Conflicts:
	code/modules/projectiles/guns/energy/special.dm
	maps/tgstation.dmm
2014-10-31 12:02:10 -05:00
ComicIronic
e0f465455d Merge remote-tracking branch 'upstream/Bleeding-Edge' into Spacepods.
Update merge conflicts.
2014-10-30 21:03:14 +00:00
d3athrow
1ed929ef3f Merge pull request #1773 from ComicIronic/FabricatorChanges
Fabricator overhaul - RnD machines
2014-10-30 14:42:11 -05:00
Chris
2605ee4870 Fix faxed stuff not having the picture attached when sent to centcom. 2014-10-28 13:26:51 -05:00
ComicIronic
5ebe31f10b Merge remote-tracking branch 'upstream/Bleeding-Edge' into FabricatorChanges 2014-10-28 15:51:23 +00:00
Chris
42679c17bb 'fix' #428 it all returns to nothing 2014-10-26 20:39:55 -05:00
ComicIronic
79fd35609c Slight changes to everything (INCOMPLETE) 2014-10-26 20:23:48 +00:00
ComicIronic
6db761572b Updated the DME, added access to the podfab and podfab to map, changed usr and span. 2014-10-25 17:49:20 +01:00
ComicIronic
5c3c8605b0 Merge remote-tracking branch 'origin/Bleeding-Edge' into MaterialsRedo 2014-10-25 14:00:54 +01:00
ComicIronic
3fc95066f3 Big ol update of materials and fabricators for research. 2014-10-25 13:36:49 +01:00
Chris
0445314e23 Merge branch 'Bleeding-Edge' into bay_hydro_port
Conflicts:
	code/game/machinery/machinery.dm
	code/setup.dm
	maps/tgstation.dmm
2014-10-24 23:42:32 -05:00
ComicIronic
0c8f475145 Merge remote-tracking branch 'upstream/Bleeding-Edge' into Spacepods 2014-10-21 20:03:32 +01:00
ComicIronic
5c471b93b8 Woopsy 2014-10-21 20:02:39 +01:00
ComicIronic
908ebfea00 Changed the spacepod system to improve it.
Added a spacepod fabricator.
Added spacepod frame parts used in spacepod construction.
2014-10-19 00:44:11 +01:00
ComicIronic
86cd0ea365 Merge remote-tracking branch 'origin/Bleeding-Edge' into MachineRecode 2014-10-15 18:03:22 +01:00
Chris
dff16798e2 Merge branch 'Bleeding-Edge' into bay_hydro_port
Conflicts:
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/reagents/reagent_containers/food/snacks/grown.dm
	html/changelogs/.all_changelog.yml
	maps/tgstation.dmm
2014-10-14 11:19:50 -05:00
ESwordTheCat
a6dc57c211 refactor police tape fix @ 1323 2014-10-06 03:07:59 -08:00
Chris
512b106f0f Bay hydroponics rewrite port, work in progress. 2014-10-05 02:25:37 -05:00
ComicIronic
d3f911d560 Update to BE. 2014-10-01 22:29:45 +01:00
Wild Bill
e8ebe03443 Fix ghost interaction with shield gens 2014-09-23 21:16:30 +03:00
ComicIronic
983f848431 Fixes to field generators under the new system. 2014-09-21 13:47:38 +01:00
Wild Bill
96af204efc Remove old unused shit 2014-09-16 15:29:57 +03:00
ComicIronic
647fe44527 Gun code fix
- Ammo_magazine is now ammo_storage into boxes, magazines, or speedloaders
- Added a speedloader for traitors and ammo boxes for the detective
- Automatics now burst-fire, which shoots fast but has longer cooldown
- Box ammo transfers have a do-after, so there's a reason to use speedloaders
- Magazines now work properly, no more empty_magazine shit
- Map changes as well
- Fully tested on all projectile types, seems to work fine
2014-09-14 21:58:54 +01:00
d3athrow
aa76aee9ab Merge pull request #1376 from SarahJohnson489/patch-5
Hotfix of IAA paper icon
2014-09-07 00:23:34 -05:00
Chris
18bebb540c merge SortTim thanks to carn 2014-09-02 18:28:14 -05:00
SarahJohnson489
84e09e7daf Hotfix of IAA paper icon
Hotfix for a change is how the papers iconstate change was handled in https://github.com/d3athrow/vgstation13/blob/Bleeding-Edge/code/modules/paperwork/paper.dm

Didn't exhaustively test everything remotely related but it should be aight.
2014-08-31 17:44:10 -08:00
dylanstrategie
2156367b49 More changes to SCP-173
- You can now manually set SCP-173's scare and neck snap sounds. Clears
up code a bit and allows more advanced gimmicks
- Clarified a few comments
- Snap damage now rand(120,150)
- Admin message now allows jumping to victims. You can use aghost to
follow SCP-173 otherwise
- Darkness check should be fixed (No longer includes unsimulated tiles
erronously, which sadly included tiles like the asteroid and maybe the
shuttle)
2014-08-27 11:39:39 +02:00
dylanstrategie
c2ad7b3cc7 More changes to SCP
- SCP no longer holds his grab on incapped people. Chainsnapping ahoy !
- Scare chord is now capped at one play every 5 seconds
- Snapping text string can be modified within reason
- Code cleaned up
2014-08-24 03:53:06 +02:00
dylanstrategie
3ed49c5407 Fixing typo 2014-08-23 04:34:57 +02:00
dylanstrategie
6e3b5d72d3 Revert "Putting changelog + Typo"
This reverts commit 0adf792a38.
2014-08-23 04:33:41 +02:00
dylanstrategie
0adf792a38 Putting changelog + Typo 2014-08-23 01:43:29 +02:00
dylanstrategie
b140dfa1b5 More work done on sculpture
- Escape function removed, SCP can no longer just leave if NOTHING is in
sight
- Instead, SCP now uses vents to move around. Time to weld those vents
- SCP now only considers humans as targets (and not all carbons, which
includes such nice things as slimes) and only registers their sight
- SCP should now longer chainsnap targets
- Messages to span
- Logs are now red, for maximal attention
- Other improvements
2014-08-22 17:08:57 +02:00