Commit Graph

1290 Commits

Author SHA1 Message Date
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
Fox-McCloud
aa1220bb86 scream 2015-10-08 19:22:11 -04:00
Fox-McCloud
e17c6bde22 Another del->qdel pass 2015-10-08 16:49:10 -04:00
TheDZD
100edde399 Merge pull request #2301 from Fox-McCloud/GC-gas-mixtures
GC Gas Mixtures
2015-10-06 17:48:15 -04:00
Mark van Alphen
eee0753773 Merge pull request #2295 from tigercat2000/intercom_nanoUI
Upgrade radios to NanoUI
2015-10-06 20:22:29 +02:00
Fox-McCloud
57d78d35aa GC Gas Mixtures 2015-10-05 17:35:42 -04:00
Fox McCloud
73b2fc122a Merge pull request #2291 from Markolie/movefix
Fixes and pinpointer update
2015-10-05 16:01:02 -04:00
Tigercat2000
9a6b5c2749 Upgrade radios to NanoUI
Things changed:
 - All radios now use nanoUI
 - Syndicate mode for any radios with syndicate access!
 - Electropacks also upgraded, since they are technically radios
 - Fancy as a motherfucker
2015-10-05 08:28:52 -07:00
Markolie
b24f5ff979 Fixes and pinpointer update 2015-10-05 00:26:43 +02:00
Fox-McCloud
6d2940eda3 Telegun Description Fix 2015-10-03 23:18:27 -04:00
Markolie
6bae20b0a0 Syringe gun update, borghydro update 2015-10-01 19:30:42 +02:00
Markolie
d18b18b5b4 Syndicate borg update, add medical syndicate borg, energy sword refactor 2015-10-01 04:21:24 +02:00
DZD
0ceaf664af Fix merge conflicts 2015-09-27 11:24:51 -04:00
Fox-McCloud
469295e791 Merge pull request #2183 from Markolie/zefixes
Changeling language fix, additional logging
2015-09-26 17:40:46 -04:00
Fox-McCloud
821d2d0309 Merge pull request #2167 from Markolie/SDQL
Add SDQL, +PROCCALL, admin updates
2015-09-26 17:40:03 -04:00
Markolie
1011d57321 Changeling language fix, additional logging 2015-09-26 22:27:36 +02:00
Markolie
d4e5149389 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fluff
Conflicts:
	code/modules/mob/living/silicon/robot/drone/drone.dm
2015-09-26 05:12:52 +02:00
Markolie
ce9545525c Varedit right checks update 2015-09-25 18:33:51 +02:00
Markolie
24337913cd Add SDQL, +PROCCALL, admin updates 2015-09-25 16:54:27 +02:00
Markolie
e96103a02b Fluff item clean-up 2015-09-25 04:31:30 +02:00