Commit Graph

17376 Commits

Author SHA1 Message Date
Citinited 2ccae61597 Better conveyor belt holder sprites, and limits bluespace belt holder to 50 belts 2018-05-21 21:15:38 +01:00
Citinited d89b6dbc57 Slight code tweaks 2018-05-21 00:39:07 +01:00
Citinited 15cd0ed63a Adds the conveyor belt placer for easier conveyor belt production 2018-05-21 00:19:26 +01:00
Crazy Lemon 689801a15c Merge pull request #9029 from Fox-McCloud/attack-animation-improvements
Further Improves Attack Animations
2018-05-18 20:33:14 -07:00
Crazy Lemon 25a3811ad3 Merge pull request #9028 from Fox-McCloud/gloves-of-death
Ports Gloves of the North Star
2018-05-18 20:20:01 -07:00
Aurorablade 522c78b42a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into FurasianFluff 2018-05-18 00:11:58 -04:00
tigercat2000 6bbf2920b9 Merge pull request #9020 from Fox-McCloud/preps-the-way
Preps the Way for Datumized Antags
2018-05-17 20:34:12 -07:00
Fox McCloud 224b18af1c Merge remote-tracking branch 'upstream/master' into attack-animation-improvements 2018-05-17 23:34:01 -04:00
Crazy Lemon 7aa9731e52 Merge pull request #8898 from tigercat2000/face_lock
Directional Locking
2018-05-17 20:28:03 -07:00
tigercat2000 85a19c9935 Merge remote-tracking branch 'upstream/master' into face_lock
# Conflicts:
#	code/modules/mob/mob.dm
2018-05-17 20:21:39 -07:00
tigercat2000 1cfc3f27c8 Merge pull request #8974 from Fox-McCloud/holo-projector
Ports Holoprojectors
2018-05-17 20:19:13 -07:00
Fox McCloud c0d5655f4d Further Improves Attack Animations 2018-05-17 19:48:03 -04:00
Fox McCloud 45858df458 Ports Gloves of the North Star 2018-05-17 17:20:28 -04:00
Aurorablade 50ef895944 Fixes missing inhands
including on other fluffs i did..
2018-05-16 19:36:43 -04:00
Fox McCloud 709f2b5ff6 Merge pull request #9004 from Anasari/BotLogging
Naming bots is now logged
2018-05-15 22:06:46 -04:00
Fox McCloud 5df7dfdaac Preps the Way for Datumized Antags 2018-05-15 21:55:44 -04:00
Aurorablade c8afde0bd0 how the hell.. 2018-05-15 19:21:24 -04:00
Fox McCloud 4c1dc7dea7 Merge pull request #9017 from Tayyyyyyy/punpun
Restore Pun Pun
2018-05-15 17:59:57 -04:00
Tayyyyyyy 8a8f244d3f Remove unneeded args 2018-05-15 01:15:27 -07:00
Tayyyyyyy fea1dada3a Restore Pun Pun 2018-05-14 22:31:05 -07:00
Aurorablade 1f0aa5e35e Fluff item 2018-05-15 01:17:25 -04:00
Crazy Lemon 63ec546a0a Merge pull request #9008 from Fox-McCloud/remove-mode
Removes All Modes
2018-05-14 17:49:58 -07:00
Fox McCloud 042ee7b77b comments 2018-05-14 20:40:39 -04:00
Fox McCloud c5cbb0414a Fixes Basilisk Projectiles 2018-05-14 19:27:43 -04:00
Fox McCloud b3524505b5 tweak 2018-05-14 17:51:13 -04:00
Ansari 69cefb7f3c Actually fix usr to user and compile 2018-05-12 10:28:26 +08:00
Ansari de818d92ab user instead of usr 2018-05-12 10:14:14 +08:00
Fox McCloud f521f2765c Removes All Modes 2018-05-11 17:55:45 -04:00
tigercat2000 64a895d6f1 Merge pull request #9003 from Kyep/monkey_business_2
Fixes snacks.dm runtime and monkey bug
2018-05-10 19:30:29 -07:00
Ansari 6084f5cfef Log bot 2018-05-10 16:32:34 +08:00
Kyep e7653b578b Tiger request 2018-05-10 00:06:17 -07:00
Kyep 6c47553fcd Fixes snacks.dm runtime and monkey bug 2018-05-09 23:57:47 -07:00
Tayyyyyyy 6f63e8b4b9 Fix Aurora Caelus spelling and grammar. Fixes #8945 2018-05-09 19:03:49 -05:00
tigercat2000 254cdd6055 Merge pull request #8972 from Fox-McCloud/power-cell
Power Cell Code Cleanup
2018-05-09 11:26:03 -07:00
tigercat2000 28c0302fb4 Merge pull request #8991 from RyanSmake/fuckingfaxes
Fax machines are no longer photocopiers
2018-05-09 11:23:29 -07:00
tigercat2000 aedece7207 Merge pull request #8989 from Kyep/nations_etc_borg_runtime
Fixes #8271 - rare borg runtimes
2018-05-09 11:22:04 -07:00
Fox McCloud 7d4fb45509 Merge pull request #8947 from tigercat2000/more_ss_ports
SS Conversion: Atoms, Machines, n' Mobs
2018-05-07 17:54:49 -04:00
ryansmake f1a71a02fc Fax machines are no longer photocopiers 2018-05-07 22:04:36 +02:00
Kyep a6d06ea397 Fixes #8271 - rare borg runtimes 2018-05-06 22:21:35 -07:00
tigercat2000 f0f540b839 Merge pull request #8978 from TravellingMerchant/Fluffupdate
Changes Merchants Fluff item.
2018-05-06 12:37:29 -07:00
tigercat2000 c78075414c Merge pull request #8488 from Kyep/ds_tweaks
Tweaks Deathsquad
2018-05-04 19:03:54 -07:00
Kyep 05e0901967 removes anti-drop implants 2018-05-04 18:36:56 -07:00
Fox McCloud 8845262d65 Merge remote-tracking branch 'upstream/master' into holo-projector
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
#	paradise.dme
2018-05-04 16:37:24 -04:00
tigercat2000 662d7f34e2 Merge pull request #8949 from Kyep/tsf_marines
Solar Federation Outfit Fixes/Tweaks
2018-05-04 12:50:38 -07:00
ryansmake 6e846018cd Performs inquisition on ATMs 2018-05-04 19:36:54 +02:00
TravellingMerchant e812cae73f Updates Merchants Fluff item. 2018-05-04 16:33:00 +01:00
tigercat2000 8071b42308 Merge remote-tracking branch 'upstream/master' into more_ss_ports
# Conflicts:
#	code/modules/food_and_drinks/food/snacks.dm
2018-05-03 19:30:41 -07:00
tigercat2000 5243c254ac Update monkey cubes 2018-05-03 19:28:35 -07:00
Kyep ee538b25d5 Monkey business logging 2018-05-02 17:02:24 -07:00
Fox McCloud 8bd042240f Power Cell Code Cleanup 2018-05-02 19:35:18 -04:00