Commit Graph

1708 Commits

Author SHA1 Message Date
Markolie
80360fd8a9 Malf AI update 2015-08-18 20:22:38 +02:00
Fox-McCloud
9e882aa22a Merge pull request #1739 from Markolie/clicking
You can now click on an inventory slot instead of a specific item
2015-08-14 21:32:37 -04:00
Markolie
85c4b99973 You can now click on an inventory slot instead of a specific item 2015-08-14 01:39:28 +02:00
Markolie
0598ebecb9 Remove unused variable causing a warning 2015-08-13 20:25:49 +02:00
Fox-McCloud
1cce7c87be Merge pull request #1716 from Markolie/rndserver
Give syndi toolbox insulated gloves
2015-08-12 22:27:53 -04:00
Fox-McCloud
427a4437e8 Merge pull request #1713 from Markolie/master
Fixes
2015-08-12 17:37:22 -04:00
Markolie
362a817d79 Runtime and bug fixes 2015-08-12 18:20:53 +02:00
Markolie
d1e776a8f2 Give syndi toolbox insulated gloves 2015-08-12 02:26:21 +02:00
Markolie
94044e6f76 Whoops 2015-08-11 22:26:29 +02:00
Markolie
27d305522b Add barber hud icon, add unique ID card for supervisors 2015-08-11 22:24:38 +02:00
Fox-McCloud
7a24a015bc ID Fixups 2015-08-10 18:36:26 -04:00
Markolie
99c7bbed55 Add card skin descriptions, let agent ID's change photo, re-add photos and job blacklist update 2015-08-10 16:00:58 +02:00
Markolie
63bff3e31d Fix double attack_self message 2015-08-10 04:29:17 +02:00
Markolie
fe512b3776 Add slot removal/additions on identification computers 2015-08-10 02:58:00 +02:00
Markolie
c9ed5fe5bc Fix typo 2015-08-09 23:46:40 +02:00
Markolie
034cf8ef69 ID card/agent ID rework 2015-08-09 23:42:55 +02:00
Fox-McCloud
c3ad070066 Ports over Airhorns 2015-08-06 00:42:17 -04:00
Fox-McCloud
fc8b310d2d Baton Fixes and Cattleprod Buff 2015-08-03 21:12:29 -04:00
Markolie
f213cf5501 Fix cable coil sprite 2015-08-03 06:37:12 +02:00
Fox-McCloud
1ee7853d65 Merge pull request #1476 from TheDZD/mining2
Mining Overhaul [Soon™]
2015-07-29 20:51:24 -04:00
Fox-McCloud
e517d172be Banana Grenade Fix 2015-07-28 21:44:46 -04:00
Fox-McCloud
eb694a50eb Updates Nuke Disk Spawning 2015-07-24 17:33:25 -04:00
DZD
66688f4dbb Fixes conflicts in icons/obj/gun.dmi. 2015-07-24 15:29:20 -04:00
Fox-McCloud
0945859066 Merge pull request #1554 from Markolie/master
Fix OneHuman law
2015-07-22 16:57:23 -04:00
Markolie
4cfd1e4340 Fix OneHuman law 2015-07-22 18:35:09 +02:00
SamCroswell
d84dfe5a49 ERT Rework - Code Changes 2015-07-20 19:37:56 -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
e4d6acb538 Changes a few del to del() 2015-07-10 23:28:08 -04:00
DZD
412443dbf1 Fix non-icon merge conflicts 2015-07-10 19:57:59 -04:00
DZD
d4cf433e7c Various fixes, changes, additions, and removal of old features.
More changes
2015-07-10 19:41:27 -04:00
Fox-McCloud
068adc1f0a Shard Runtime Fix 2015-07-10 05:44:29 -04:00
Fox-McCloud
54f59b9899 Pass II 2015-07-09 19:51:40 -04:00
Fox-McCloud
0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
Fox-McCloud
6e87b96501 Pass 3 2015-07-08 01:34:53 -04:00
Fox-McCloud
9dc27ce126 Destroy Pass II 2015-07-07 22:26:28 -04:00
Tigercat2000
3a45d52fe0 Fix remaining non-returning Destroys()
Plus a little refactor to mining flaps and spacepod doors- they now use
CanAtmosPass instead of manually setting the turf to no-atmos-passing
2015-07-06 09:20:39 -07:00
TheDZD
b38d741801 Merge pull request #1446 from Fox-McCloud/pools-and-fires
Pools Hotspots
2015-07-05 17:51:20 -04:00
TheDZD
59b154e8cb Merge pull request #1452 from Fox-McCloud/parents-and-procs
Tweaks a Few Destroy()'s
2015-07-05 17:51:03 -04:00
Fox-McCloud
44881a4016 Tweaks a Few Destroy()'s 2015-07-05 04:51:47 -04:00
Fox-McCloud
ab28186d13 Kill is Kill 2015-07-04 19:27:43 -04:00
Fox-McCloud
389eab6e32 Analyzer Scan Refactor 2015-07-02 02:01:13 -04:00
Fox-McCloud
62ef1cb7e2 TG Supermatter Port 2015-06-30 21:07:08 -04:00
Fox-McCloud
c2567b92a8 Merge pull request #1414 from SamCroswell/martialarts
Thunderdome and Admin Room Changes
2015-06-30 16:55:10 -04:00
SamCroswell
ebabf9f7bb Map Edits, Minor Fixes 2015-06-29 16:22:59 -04:00
Fox-McCloud
eec810647a Chainsaw Tweaks 2015-06-28 15:58:04 -04:00
Tigercat2000
e41fbaa146 Fix ziptie log being backwards. 2015-06-23 13:19:05 -07:00
ZomgPonies
4d9baf9936 Merge pull request #1358 from Fox-McCloud/sarin-tabun
Sarin -> Tabun
2015-06-22 21:40:51 -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
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