Commit Graph

411 Commits

Author SHA1 Message Date
Markolie
f41f0a59fe Guns update 2015-09-14 04:05:20 +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
Fox-McCloud
1d7ecf48ff Adds Mining Voucher to QM's locker 2015-09-08 12:53:57 -04:00
KasparoVy
f3ba11fbda Adds Warden Corporate and HoS Corporate Uniforms to Appropriate Lockers 2015-09-04 15:49:27 -04:00
Fox-McCloud
e2347866a8 Merge pull request #1926 from Markolie/lordoftheflies
Make lockers use forceMove()
2015-09-02 15:58:09 -04:00
Markolie
8d7bd64a00 Make lockers use forceMove() 2015-09-01 18:49:19 +02: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
78950ec682 tweak 2.0 2015-08-05 20:12:11 -04:00
Fox-McCloud
ab083aff50 Mining Fixes 2015-07-30 17:01:59 -04:00
DZD
29e70854e9 Fix merge conflicts
🖕 map conflicts over lines that weren't even edited by both upstream
and this branch.
2015-07-15 22:28:12 -04:00
Fox-McCloud
057c15982e Re-adds Security Helmets to Officer's Lockers 2015-07-11 10:10:57 -04:00
DZD
412443dbf1 Fix non-icon merge conflicts 2015-07-10 19:57:59 -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
a89ddd5a7d Adds in Ether 2015-06-28 20:39:26 -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
Fox-McCloud
44f7ad997c Merge pull request #1355 from tigercat2000/tgetor2
Bay/-tg- Meteor port
2015-06-22 16:37:23 -04:00
Krausus
62946e5217 Fixes medical wardrobe containing excess clothing 2015-06-21 22:07:40 -04:00
Krausus
831332155a Fixes generic wardrobe contents
This fixes the wardrobe base type creating items, which was fine when
wardrobes didn't call their parent's New proc, but was causing literally
every wardrobe to contain some junk now that they do.

The base wardrobe type's items have been moved to a new "generic"
wardrobe, which is now used in the derelicts and an unused away mission,
replacing mapped instances of the base type.
2015-06-21 21:50:35 -04:00
Tigercat2000
7c9139d6e0 Bay/-tg- Meteor port
Meteors now have different types, properly integrated.
Meteoract has been removed, meteors now just call ex_act.
2015-06-21 18:39:39 -07:00
Tigercat2000
d20298e996 -tg- atom pooling system, qdel changes
This commit first and foremost ports the -tg- atom pooling system, and
removes the old experimental system entirely.

Secondly, this PR modifies the qdel system to use a -tg- lookalike
"destroy hint" system, which means that individual objects can tell qdel
what to do with them beyond taking care of things they need to delete.
This ties into the atom pooling system via a new hint define,
QDEL_HINT_PUTINPOOL, which will place the atom in the pool instead of
deleting it as per standard.

Emitter beams are now fully pooled.

Qdel now has semi-compatibility with all datum types, however it is not
the same as -tg-'s "Queue everything!" system. It simply passes it through
the GC immediately and adds it to the "hard del" lists. This means that
reagents can be qdel'ed, but there is no purpose as of yet, as it is more
or less the same as just deleting them, with the added effect of adding
logs of them being deleted to the garbage collector.
2015-06-21 15:47:57 -07:00
Fox-McCloud
8e450f99c8 tweaks and optimization 2015-06-21 02:16:18 -04:00
Fox-McCloud
cbc9458379 Merge pull request #1331 from TheBeoni/Brig-Phys
Brig Doctor Jumpsuit.
2015-06-17 23:02:06 -04:00
TheBeoni
fd4c40fcf9 Added brig physician jumpsuit. Brig Physician spawns with one, i also put one spare into locker. 2015-06-17 02:11:01 +02:00
Nienhaus
060318cb29 Adds Deer ;D 2015-06-15 18:50:39 -05:00
Fox-McCloud
8a78887ba6 Blueshield Jacket Re-submission 2015-06-14 14:23:55 -04:00
Fox-McCloud
4eadd086d0 Fixes Wardrobes an Item Spawning 2015-06-04 20:13:18 -04:00
Fox-McCloud
296093951b defib failed 2015-06-03 02:24:02 -04:00
Fox-McCloud
c5f16b538a oops 2015-06-03 00:27:38 -04:00
Fox-McCloud
41512b0252 Exam Room Tweaks 2015-06-02 23:17:17 -04:00
Fox-McCloud
5d3e837b4a Mob Refactor+Update and Pet Collars 2015-05-28 00:20:25 -04:00
FalseIncarnate
a1cce51559 Merge Conflict Fix, Attempt 2 2015-05-27 01:07:19 -04:00
FalseIncarnate
c385cb7f4f Botany Belt, Biogenerator Additions
Adds in the new Botany Belt, a belt designed for handling all sorts of
botany-related tools.

Adds the Botany Belt, Security Belt, Medical Belt, Janitor Belt, and
Bandolier to the Biogenerator's list of products.

Re-arranges the biogenerator's product listing to have a new "Belts"
section, dedicated to (you guessed it) belts.
- Moves the Utility (tool) into the Belts section, previously was in the
Leather section
- The new belt listings are also in this section.

All belts in the biogenerator have the same base cost of 300 points.
Increasing the efficiency of the machine will lower the costs
appropriately.

Adjusts some code related to the security belt so they won't magically
have a seclite in them when created via biogenerator.
- The belts in the sec lockers will still have their light
- The ERT belt no longer needs to clear contents during its New() proc
to remove the seclite.
2015-05-26 13:54:24 -04:00
ZomgPonies
264369bdfa issmall fixes and order of operations 2015-05-25 23:50:53 -04:00
ZomgPonies
e056abfb82 3/3 port done 2015-05-25 20:16:34 -04:00
ZomgPonies
1935a82afe 2/3 of port done 2015-05-25 19:48:13 -04:00
Fox-McCloud
5b26b1ca59 Janitor--Bar of Soap 2015-05-23 20:50:12 -04:00
Fox-McCloud
1c1eec3210 Tweaks and Fixes 2.0 2015-05-22 16:29:12 -04:00
Fox-McCloud
8a5e3663df Fixes and Tweaks 2015-05-15 21:58:24 -04:00
Tigercat2000
0a991322c3 MAP: Cyberiad, Corp jumpsuits, Engi curtains
This commit does the following:
 - Adds a corporate wardrobe to security, equipped with 3
   corporate jumpsuits and 3 corporate caps.
 - Changes the shower curtain on the engineering outpost from a regular
   curtain to an engineering curtain, because we have those now
2015-05-13 07:22:25 -07:00
FreeStylaLT
c290b1471e Engineering berets changes
Adds in a REAL Engineering beret, renames the current one to "atmospherics
beret", they spawn in engineering and CE's lockers.
2015-05-03 01:41:42 +03:00
Fox-McCloud
1b0ea1e226 Adds in Rings 2015-04-29 19:05:43 -04:00
Svej
a0e1cd5683 Nanotrasen Representative hat
Adds a fancy hat to the NT Reps locker
2015-03-30 14:10:28 +02:00
ZomgPonies
e2a4ccc8a6 Merge pull request #681 from Fox-McCloud/End-Era
[Goonchem] Transition to Goonchem
2015-03-28 12:25:35 -04:00
Fox-McCloud
d1932c0f64 [Goonchem] Transition to Goonchem 2015-03-27 05:41:45 -04:00
Cheridan
acba4c6cf6 Adds construction permits
Conflicts:
	code/game/gamemodes/objective_items.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/paperwork/photography.dm
	icons/obj/items.dmi
2015-03-26 18:52:29 +01:00
Fox-McCloud
b30d3f795f Goonchem Map Changes 2015-03-24 22:48:25 -04:00
Fox-McCloud
8da3cb1de5 Merge pull request #616 from tigercat2000/BorgIlocker
Allow borgs to open-close lockers properly
2015-03-22 18:00:35 -04:00
Tigercat2000
689713ddbd Add clickdelay to attacking statues 2015-03-22 18:24:20 +01:00