Commit Graph

1309 Commits

Author SHA1 Message Date
Crazylemon 4133e98dfe Port of RemieRichard's infinite antag system
This is just the first chunk, of fixing around the be_special flag stuff
It will probably break everything as-is
2015-12-25 22:51:02 -08:00
Mark van Alphen 13f2f92624 Merge pull request #2999 from Fox-McCloud/tesla-port-final
Ports TG's Tesla Engine
2015-12-25 16:21:11 +01:00
Fox-McCloud 5069d949bd Ports TG's Tesla Engine 2015-12-24 00:40:20 -05:00
tigercat2000 c5e37ee695 Restore drone law order
#1913 changed the drone laws, staffchat is having a fit over it, so whatever
2015-12-23 12:09:40 -08:00
Fox-McCloud bbf3b528c4 Field Generator Refactor+Fixes 2015-12-22 13:40:53 -05:00
Aurorablade 6bde6078e2 don't code half awake
also added some hud making stuff to the make antag procs. it might fix
an issue fox reported..more sleep now
2015-12-20 07:16:35 -05:00
Aurorablade 3ae8118b9c please let me have map merged right.... 2015-12-18 03:09:25 -05:00
Aurorablade ccd6d2641b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HudRefactor 2015-12-17 22:43:09 -05:00
Aurorablade 52e43c4d2d good news everyone! It works! 2015-12-17 01:29:21 -05:00
Fox-McCloud a9a0a49986 Ports TG Beam Code and Medigun 2015-12-16 21:05:10 -05:00
Aurorablade c3f662a6dc zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz 2015-12-15 03:08:16 -05:00
Aurorablade 95d8b50345 hud_updateflag purge!
EXTERMINATUS BITCH
2015-12-13 17:16:14 -05:00
Tigercat2000 3d71483372 /vg/ / -tg- asset_cache
Port of -tg-'s port of /vg/'s asset cache
Funny thing is, this actually replaces an old version of /vg/'s asset
cache we already had
IT'S A PORT OF A PORT REPLACING A PORT
POOOOOOOOOOOOOORTCEPTION

Basically, gets rid of the 30-40 second interface lag when you first join,
via *mumblemumble* MAGIC!

Also moves a few nano files around.
2015-12-12 21:25:04 -08:00
Aurorablade aca9d31853 almossstttttt 2015-12-12 18:45:07 -05:00
Aurorablade 374867baf7 Now channeling beepsky 2015-12-11 14:57:41 -05:00
Aurorablade 950ae86a92 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HudRefactor 2015-12-10 06:47:43 -05:00
Aurorablade 972177d1e9 its working..kinda 2015-12-10 06:45:19 -05:00
Aurorablade c590958f2d Hud refactor 2015-12-10 01:01:54 -05:00
Fox-McCloud cf42d3b037 Re-Adds Weapon Based Nettles 2015-12-08 07:24:43 -05:00
Fox McCloud 3fad5ca991 Merge pull request #2742 from ZomgPonies/blood
exotic blood changes
2015-12-07 01:03:06 -05:00
Fox-McCloud cc16f034ee Fixes Records 2015-12-05 19:01:51 -05:00
ZomgPonies fab7f1f6b0 exotic blood changes 2015-12-05 16:46:07 -05:00
Aurorablade 2c5a210ad8 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into Guardingthings 2015-11-24 21:08:43 -05:00
Tastyfish 85d651b781 refactored datum/effect/system because it was a complete mess 2015-11-22 19:43:01 -05:00
TheDZD 740e5304fd Merge pull request #2613 from ZomgPonies/nations2
Nations 2.1
2015-11-21 22:20:39 -05:00
TheDZD bbab399d6e Merge pull request #2599 from Fox-McCloud/thanksgiving-food
Thanksgiving Update
2015-11-20 19:46:47 -05:00
ZomgPonies f259263fdd Changed AI law to a single comprehensive ruleset 2015-11-20 10:35:09 -05:00
Aurorablade 5986006578 guarding yo things 2015-11-20 08:11:22 -05:00
ZomgPonies ced5567176 its 2015-11-19 18:46:30 -05:00
ZomgPonies 84e9978cf4 Law tweaks 2015-11-19 15:38:14 -05:00
ZomgPonies 6c907de639 Cleaning up following DZD's recommendations 2015-11-19 15:24:06 -05:00
Fox-McCloud f43e21698c Updates 2015-11-18 23:17:31 -05:00
ZomgPonies f44f14aa9a Updated Nations with AI stuff, including 4 test lawsets 2015-11-18 19:41:25 -05:00
ZomgPonies cec5390c99 Nations 2.0 initial commit 2015-11-15 15:24:51 -05:00
Crazylemon64 1b4a39eb24 MULEbots notify on relevant deliveries
Also:
	-Adds more request consoles throughout the map
		- Atmospherics, Brig Medbay, Warden, Security
2015-11-14 14:29:24 -08:00
TheDZD 0e94e359f1 Merge pull request #2506 from Fox-McCloud/kitchen-changes
Kitchen Updates
2015-11-10 19:35:29 -05:00
Fox McCloud 4325daaabc Merge pull request #2497 from tigercat2000/html5_stuff
HTML5, IE11, CSS3
2015-11-09 20:59:14 -05:00
Fox-McCloud ab3ed53734 Kitchen Updates 2015-11-09 01:09:59 -05:00
Fox-McCloud 318c464f94 Aquarium Starter Kit 2015-11-08 07:38:09 -05:00
Tigercat2000 d36352ae7c HTML5 and CSS3 for NanoUI + Datum Browser 2015-11-06 11:27:32 -08:00
Fox-McCloud 1c8df180f8 Merge remote-tracking branch 'upstream/master' into barber-update 2015-11-05 19:42:41 -05:00
Fox-McCloud 800b8a52b0 scissor cost change 2015-11-05 10:23:42 -05:00
Fox-McCloud 40a5abbb4a Barber Update 2015-11-05 02:04:46 -05:00
Aurorablade 4549035505 Reasons to NOT give me ideas.... 2015-10-24 01:59:49 -04:00
Aurorablade 2627aea234 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into LechucksRevenge 2015-10-21 06:58:23 -04:00
TheDZD d681cefa03 Merge pull request #2362 from Fox-McCloud/gc-everything
Garbage Collect Everything
2015-10-18 16:44:35 -04:00
Aurorablade a77885be69 wizard-chan Nyaa~! 2015-10-14 23:59:16 -04:00
Aurorablade c520586953 changes
added new posible skeleton outfits
Chaplain traitor voodoo doll, Tell me if the TC cost needs adjusting.
On Click fix...
2015-10-14 20:39:29 -04:00
Fox-McCloud e60edf9345 Garbage Collect Everything 2015-10-13 20:23:26 -04:00
Fox-McCloud 9795dc761b Removes Nations and Unused Game Modes 2015-10-11 19:51:19 -04:00