Commit Graph

10311 Commits

Author SHA1 Message Date
ZomgPonies
c51f92bf37 Adds combat droid subtype 2015-11-20 11:38:14 -05:00
ZomgPonies
f259263fdd Changed AI law to a single comprehensive ruleset 2015-11-20 10:35:09 -05:00
ZomgPonies
efd8a88921 Adds Servicion nation 2015-11-19 23:25:54 -05:00
ZomgPonies
19e3b2d5bc Make sure RD can't blow borgs or fuck with AI 2015-11-19 21:06:54 -05:00
ZomgPonies
b9f5293f01 Gives civilians mercenary message 2015-11-19 20:50:38 -05:00
TheDZD
bcdcfe728b Merge pull request #2603 from Fox-McCloud/rcs-exploit-fix
Fixes RCS Teleport Exploit
2015-11-19 20:14:07 -05:00
Fox McCloud
f52cc886b8 Merge pull request #2565 from ZomgPonies/nations
Nations 2.0
2015-11-19 19:33:21 -05:00
ZomgPonies
4bf718980c Added NT Rep + Blueshield to commandizkstan 2015-11-19 17:43:43 -05:00
ZomgPonies
44cf24daec Fixes spans 2015-11-19 15:33:26 -05:00
TheDZD
dae629d599 Merge pull request #2591 from Fox-McCloud/spider-faction
Spiderling and Factions
2015-11-19 15:33:16 -05:00
TheDZD
b644efa34b Merge pull request #2592 from ZomgPonies/meteor3
Meteor balance patch 3
2015-11-19 15:33:10 -05:00
ZomgPonies
6c907de639 Cleaning up following DZD's recommendations 2015-11-19 15:24:06 -05:00
ZomgPonies
5ce1929a5b Might help to actually set the AI 2015-11-19 10:02:44 -05:00
Fox-McCloud
763d0e23c0 Fixes RCS Teleport Exploit 2015-11-19 01:59:46 -05:00
Fox McCloud
8c1f11fb0b Merge pull request #2566 from Robertha89/master
Fixes invisible wrapping paper, sonic jackhammer not breaking walls and field surgery kit not fitting its own content
2015-11-18 21:26:23 -05:00
ZomgPonies
f44f14aa9a Updated Nations with AI stuff, including 4 test lawsets 2015-11-18 19:41:25 -05:00
Robertha89
b774e54a4d Forgot two " 2015-11-19 00:41:18 +01:00
Robertha89
51d3724abf Typos, fixes and whatnot 2015-11-19 00:36:56 +01:00
ZomgPonies
ceac0f3b81 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into nations
Conflicts:
	code/__HELPERS/global_lists.dm
2015-11-18 18:33:40 -05:00
ZomgPonies
c029cf5f50 Meteor balance patch 3 2015-11-18 15:41:51 -05:00
Fox-McCloud
bdd45eacdc Spiderling and Factions 2015-11-18 14:51:04 -05:00
Fox McCloud
d07bce4a66 Merge pull request #2515 from Spacemanspark/master
Adds in toy chainsaws.
2015-11-18 14:04:17 -05:00
Fox McCloud
e1eba640d0 Merge pull request #2580 from ZomgPonies/meteors2
Update to meteor gamemode
2015-11-18 13:36:14 -05:00
Fox McCloud
688eca6bf5 Merge pull request #2582 from Crazylemon64/mechanic_ore_access
Mechanic now has access to ore reclaimer
2015-11-18 12:51:48 -05:00
Spacemanspark
eb28de5e42 Removes useless return statement from toy chainsaws
If this breaks something I'm going to remove Tigercat's soul.
2015-11-17 19:31:48 -06:00
Fox McCloud
1323e858c1 Merge pull request #2585 from Tastyfish/pipes
Fixed placing down bent pipes, (un)fastening HE pipes
2015-11-17 19:12:07 -05:00
Fox McCloud
63cec575cf Merge pull request #2576 from tigercat2000/IM_GOING_TO_FUCKING_GO_INSANE_GODDAMNIT
Cleaning time, x1.
2015-11-17 18:58:34 -05:00
Tastyfish
2694646a7e Fixed placing down bent pipes, unfastening HE pipes, fastening uncoupled junction pipe 2015-11-17 11:39:21 -05:00
Robertha89
e92a59d67f Revert Dwarf, TK and Hulk visibility 2015-11-17 07:54:45 +01:00
Crazylemon
79b73966e8 Mechanic now has access to ore reclaimer
Space pod fleet ahoy!
2015-11-16 19:43:06 -08:00
Fox McCloud
0c5565bdb1 Merge pull request #2434 from Aurorablade/TooSpoopy
Fethas Carnival of Horrors part 3: Paranormal Activity
2015-11-16 22:23:50 -05:00
ZomgPonies
b888e72baa Update to meteor gamemode 2015-11-16 19:40:47 -05:00
Tigercat2000
46901d74b2 Merge remote-tracking branch 'upstream/master' into IM_GOING_TO_FUCKING_GO_INSANE_GODDAMNIT
Conflicts:
	code/game/gamemodes/meteor/meteor.dm
2015-11-16 14:28:27 -08:00
TheDZD
6ff5ef7ae4 Merge pull request #2543 from ZomgPonies/meteors
Fixes to Meteor Gamemode
2015-11-16 17:21:19 -05:00
TheDZD
c93e97143d Merge pull request #2569 from Crazylemon64/cyborg_recharger_fix
IPCs now heal in an upgraded cyborg recharger
2015-11-16 17:20:43 -05:00
TheDZD
cb463daa53 Merge pull request #2541 from ZomgPonies/superheroes
[BUGFIX] Fixes bug allowing player to multiclick WG
2015-11-16 17:20:32 -05:00
Tigercat2000
b36a32b6b8 Gamemode cleanup x1
Changelog:
 - Enemy intercept (send_intercept()) completely nuked, it did not compile
   when I attempted to make it into a config option.
  - The intercept for blob() is retained and made into a custom proc for
    blob.
 - The constant variables 'waittime_l' and 'waittime_h' have been moved to
   /datum/game_mode, as they were defined on every gamemode with the same
   values.
 - rp-revolution.dm and anti_revolution.dm deleted. They do not compile,
   and are not included in the DME already.
2015-11-16 11:51:18 -08:00
ZomgPonies
3acdaccfd3 Cleaned up code following Tiger's recommendations 2015-11-16 11:26:21 -05:00
Robertha89
5c50d20d67 Fixes field surgical kits 2015-11-16 08:51:43 +01:00
Aurorablade
bc7a0864d5 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into TooSpoopy 2015-11-16 01:15:41 -05:00
Crazylemon
6927c6164a IPCs now heal in an upgraded cyborg recharger
Upgrading the recharger cell will also increase how fast IPCs recharge
2015-11-15 15:38:45 -08:00
Robertha89
5a714bae2a Fixes Hulk and TK sometimes not being visible 2015-11-15 23:04:26 +01:00
Robertha89
3936231e53 Fixes Sonic Jackhammer 2015-11-15 21:53:21 +01:00
ZomgPonies
cec5390c99 Nations 2.0 initial commit 2015-11-15 15:24:51 -05:00
Tastyfish
91ed12e29d Fixed battle arcade circuit board type 2015-11-15 14:37:15 -05:00
ZomgPonies
0817c907d9 Fixed up if/elseif chains 2015-11-15 12:10:42 -05:00
TheDZD
dc24c9b99d Merge pull request #2552 from tigercat2000/ugh_really
WHEELCHAIRS ARE NOT SPORTS BIKES
2015-11-15 11:59:28 -05:00
Fox McCloud
0b5875992b Merge pull request #2538 from Crazylemon64/miner_announce
Additional Requests Console Functionality
2015-11-15 08:17:20 -05:00
Tigercat2000
89b1472929 whoops not that slow 2015-11-14 21:17:53 -08:00
Tigercat2000
0a7225e8eb wheelchair speeds 2015-11-14 21:09:23 -08:00