Commit Graph

840 Commits

Author SHA1 Message Date
Robertha89
acb55613d4 Better way of calling material and tech name 2015-10-10 12:11:19 +02:00
Robertha89
836ddb15d4 Science analyser goggles 2015-10-09 08:22:45 +02:00
Fox-McCloud
e17c6bde22 Another del->qdel pass 2015-10-08 16:49:10 -04:00
Mark van Alphen
09c0f235e6 Merge pull request #2318 from Fox-McCloud/no-pools-allowed
Axes Some Pooling of Specific Objects
2015-10-08 19:28:38 +02:00
Fox-McCloud
69d7a7ed1d Axes Some Pooling 2015-10-08 01:26:15 -04:00
Fox-McCloud
623696b985 Ammo Update and Fixes 2015-10-06 17:18:39 -04:00
Markolie
8e37513502 Make sure all departments can still sync with R&D 2015-09-28 20:39:30 +02:00
Markolie
f7fe8c8c6f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixes3
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
2015-09-28 03:05:04 +02:00
Mark van Alphen
48a3d1ab9a Merge pull request #2176 from Fox-McCloud/janicarts-and-janitors
Janicart and Janitor Update
2015-09-28 03:02:04 +02:00
Fox-McCloud
569758f4cb bluespace trashbag 2015-09-27 06:46:50 -04:00
Markolie
75c7cf165a R&D fixes 2015-09-27 06:58:55 +02:00
Markolie
0034a8a116 Experimentor log fix 2015-09-27 00:20:42 +02:00
Mark van Alphen
6f9ce5d65c Merge pull request #2164 from Fox-McCloud/gas-turbine
Gas Turbine
2015-09-26 21:27:11 +02:00
Fox-McCloud
4413911688 Janicart and Janitor Update 2015-09-26 06:17:29 -04:00
Fox-McCloud
fb2109578f Merge remote-tracking branch 'upstream/master' into gas-turbine 2015-09-25 23:03:55 -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
Tigercat2000
26bc8dff8b Merge remote-tracking branch 'origin/bucklieng' into muh_tg_spessmove 2015-09-25 12:05:42 -07:00
Fox-McCloud
d5a6959c27 Gas Turbine 2015-09-25 05:23:05 -04:00
Tigercat2000
4f3938d68b -tg- buckling system
This commit overhauls a bunch of systems so that buckling works for
any subtype of /obj. This means that space vines and chairs and beds all
use the same system. A lot of stuff has been touched.
2015-09-24 15:52:10 -07:00
Fox-McCloud
c3597ee1aa EXPERI-Mentor Bandaid Fix 2015-09-24 02:07:34 -04:00
Tigercat2000
8397048965 Make EXPERI-Mentor SetTypeReactions() way more efficient
Thanks, Redbook.

Basically, this used to spawn a shitload of instances and then qdel them;
Just so it could check their icon_state and see if it's not null. However,
spawning so many instances is quite intensive. An undocumented feature
(documented in the redbook, a list of undocumented features); You can
directly access a compile-time variable with just it's path by using
initial().
2015-09-23 12:05:02 -07:00
Markolie
039a79ff26 Research consoles auto sync fix 2015-09-23 02:52:07 +02:00
Markolie
3c7413dc65 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pet
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
2015-09-22 00:17:30 +02:00
Markolie
ea305d3ffa Saber SMG update, add armour piercing variable 2015-09-21 22:50:07 +02:00
Fox-McCloud
bd3696523b GC a few Datums 2015-09-20 22:40:13 -04:00
Mark van Alphen
739e820faa Merge pull request #2078 from Fox-McCloud/experimentor
EXPERI-Mentor Addition--Telesci Removal
2015-09-18 07:18:55 +02:00
Fox-McCloud
d234a50b16 Further Protolathe Fixes 2015-09-17 20:07:58 -04:00
Fox-McCloud
a35a8cef1b Protolathe Fix 2015-09-17 03:43:36 -04:00
Fox-McCloud
a24b91d369 reagent amounts adjustment 2015-09-17 02:08:20 -04:00
Fox-McCloud
d41b09c0a6 Experimentor Addition--Telesci Removal 2015-09-17 00:59:38 -04:00
Markolie
0db98340f8 Further welding tool updates 2015-09-16 01:37:07 +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
Mark van Alphen
cbb2a16409 Merge pull request #2046 from Fox-McCloud/tech-shell-balance
Tech Shells: Silver Removal
2015-09-15 17:36:57 +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
Fox-McCloud
6fd7350746 Merge pull request #2040 from Markolie/guns
Guns update
2015-09-14 22:11:33 -04: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
Fox-McCloud
8faf18484c Tech Shells: Silver Removal 2015-09-14 06:40:35 -04:00
Markolie
f41f0a59fe Guns update 2015-09-14 04:05:20 +02:00
Markolie
aaeac981b9 Temperature gun update 2015-09-13 21:05:23 +02:00
Fox-McCloud
25c35343dc materials-consitency 2015-09-12 16:22:39 -04:00
Fox-McCloud
54fc3d9aa2 fixes 2015-09-12 15:59:02 -04:00
Fox-McCloud
15fc8144e8 Protolathe Materials Refactor 2015-09-12 03:35:22 -04:00
Fox-McCloud
2e7dcf89f2 Fixes RD Console Var Warning 2015-09-09 23:35:07 -04:00
Fox-McCloud
5551b7aa56 ewwwww 2015-09-08 20:05:27 -04:00
Fox-McCloud
28bcd7e78b R&D Update and Fix & Cargo Tweaks 2015-09-07 20:03:06 -04:00
TheDZD
0fdfae99ba Merge pull request #1966 from Fox-McCloud/health-assembly
Health Assembly
2015-09-07 17:24:52 -04:00
Fox-McCloud
3250621552 Health Assembly 2015-09-06 02:19:44 -04:00
Fox-McCloud
2214a8b455 R&D Update: Implants and Autolathes 2015-09-05 23:57:22 -04:00
Fox-McCloud
64b2bb3784 Merge remote-tracking branch 'upstream/master' into material-datums 2015-09-04 22:53:20 -04:00
Fox-McCloud
fd8b4ca578 numbers fixes 2015-09-04 17:32:22 -04:00