Commit Graph

303 Commits

Author SHA1 Message Date
Fox-McCloud
80e2676e0c medbot fixes and tweaks and features 2015-12-16 00:02:18 -05:00
Fox-McCloud
7a766067ee typo 2015-12-15 22:11:00 -05:00
Fox-McCloud
6105699160 More Medbot Skins 2015-12-15 20:02:29 -05:00
TheDZD
55e0ac4507 Merge pull request #2770 from Fox-McCloud/bacpacks-and-stuff
Backpack Fixes and Port
2015-12-08 22:00:50 -05:00
Fox-McCloud
00800803ff Backpack Fixes and Port 2015-12-07 19:11:24 -05:00
Certh
6bdad2a9d9 The examine line of the safe was broken due to w_class being above 5. Tuned it down to 5 (huge item) 2015-12-07 16:33:44 +01:00
Fox-McCloud
0bbd8ea8d2 Botany QoL Changes 2015-11-30 20:03:59 -05:00
Tastyfish
85d651b781 refactored datum/effect/system because it was a complete mess 2015-11-22 19:43:01 -05:00
TheDZD
13efd8eeae Merge pull request #2611 from Fox-McCloud/porta-seeder
Re-Adds Portaseeder
2015-11-21 21:27:12 -05:00
Fox-McCloud
3e4059728f Re-Adds Portaseeder 2015-11-20 00:26:51 -05:00
Fox-McCloud
edf2bfc4fc Chemistry and Bio-Bags and Xenobio QoL 2015-11-19 20:38:07 -05:00
Robertha89
5c50d20d67 Fixes field surgical kits 2015-11-16 08:51:43 +01:00
Fox-McCloud
318c464f94 Aquarium Starter Kit 2015-11-08 07:38:09 -05:00
Fox-McCloud
2335c6be9d Merge remote-tracking branch 'upstream/master' into barber-update 2015-11-06 06:30:59 -05:00
Fox-McCloud
17112cda3d barber update 2.0 2015-11-05 06:51:00 -05:00
Fox-McCloud
40a5abbb4a Barber Update 2015-11-05 02:04:46 -05:00
Fox-McCloud
4687620436 Adds Random Cigs 2015-11-04 22:47:18 -05:00
Fox-McCloud
9795dc761b Removes Nations and Unused Game Modes 2015-10-11 19:51:19 -04:00
Fox-McCloud
4c5706bc3a more...fixes 2015-10-10 08:52:35 -04:00
Fox-McCloud
e17c6bde22 Another del->qdel pass 2015-10-08 16:49:10 -04:00
Markolie
d18b18b5b4 Syndicate borg update, add medical syndicate borg, energy sword refactor 2015-10-01 04:21:24 +02:00
Fox-McCloud
444c616d5a Ports NT Station's Belt of Holding Sprite 2015-09-27 23:43:41 -04: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
Robertha89
495a5bfe31 Death Alarm Implant Kit change
Add's a sixth implant, and removes the implantpad, as it is not needed for deathimplants.
2015-09-26 19:29:48 +02:00
Fox-McCloud
b01d49d72c Borg Update: MMI and Suits 2015-09-17 06:50:24 -04:00
Fox-McCloud
bef21a964d Merge pull request #2068 from Markolie/lawstate
Welding tool refactor, in-hand updates
2015-09-16 19:07:29 -04:00
Mark van Alphen
02921fea74 Merge pull request #1971 from Regen1/mechweapons
Mech weapons spawn in lockboxes framework
2015-09-16 21:17:27 +02:00
Mark van Alphen
d708ee8d84 Merge pull request #2058 from Fox-McCloud/cluster-grenade-cleanup
Cluster Grenade Cleanup
2015-09-16 20:22:38 +02:00
Markolie
0741669bd6 Implement remove_item_from_storage properly, syndi toolbox tool color update 2015-09-16 01:54:34 +02:00
Markolie
0db98340f8 Further welding tool updates 2015-09-16 01:37:07 +02:00
Markolie
951b58af5a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lawstate
Conflicts:
	code/game/objects/items/weapons/tools.dm
2015-09-16 01:32:33 +02:00
Markolie
aeabab7248 Welding tool refactor, in-hand updates 2015-09-16 01:27:15 +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
1539a4d1e8 Merge pull request #2041 from Fox-McCloud/backpacks
Backpack Storage Rework
2015-09-15 06:58:44 +02:00
Fox-McCloud
1979043d84 Cluster Grenade Cleanup 2015-09-15 00:04:57 -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
1e1c667ad5 Backpack Storage Rework 2015-09-13 23:22:09 -04:00
Markolie
ca6c7d10ba In hand sprite overhaul 2015-09-13 22:44:18 +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
d70c166109 Rad Laser Fix 2015-09-09 17:00:53 -04:00
Fox-McCloud
71f6b312d8 tweak 2015-09-08 22:01:05 -04:00
Fox-McCloud
1c6c733a52 Nuke Ops and Traitor Update+Balance 2015-09-08 19:38:30 -04:00
Regen
c4e0f4ad3b Lockbox update
Makes it so the mech weapons actually do spawn in lockboxes
Also adds a large lockbox to fit the mech weapons (No sprite as of yet)
2015-09-06 22:55:22 +02:00
Fox-McCloud
64b2bb3784 Merge remote-tracking branch 'upstream/master' into material-datums 2015-09-04 22:53:20 -04:00
Fox-McCloud
ea6bfdf758 upgradeable recycler 2015-09-04 19:41:42 -04:00
Fox-McCloud
a019934e9e Pass I 2015-09-04 05:18:48 -04:00
Fox-McCloud
9b8342897e Cult Tweaks 2015-09-02 21:08:08 -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
Fox-McCloud
110abbda59 R&D Lockbox Origintech 2015-08-25 21:24:09 -04:00