Commit Graph

11379 Commits

Author SHA1 Message Date
Tigercat2000
b007c3cff7 Fix internals dropping exploit. 2015-11-24 07:07:52 -08:00
TheDZD
9afae90ee4 Merge pull request #2628 from Fox-McCloud/slime-extracts
TG Slime Extracts Port
2015-11-23 17:22:50 -05:00
TheDZD
56d2da55b8 Merge pull request #2629 from Fox-McCloud/fox-rest
Adds Fox Resting Sprite
2015-11-23 17:22:45 -05:00
ZomgPonies
3590262ed2 Minor bugfix patch 2015-11-22 14:05:06 -05:00
Fox-McCloud
ad0031831b Adds Fox Resting Sprite 2015-11-22 06:07:07 -05:00
Fox-McCloud
3522d1f9bd TG Slime Extracts Port 2015-11-22 03:05:29 -05:00
TheDZD
740e5304fd Merge pull request #2613 from ZomgPonies/nations2
Nations 2.1
2015-11-21 22:20:39 -05:00
ZomgPonies
937cb63dfa Cyborg Egun no longer EMP immune 2015-11-21 22:06:09 -05:00
TheDZD
4075dba6fb Merge pull request #2596 from Fox-McCloud/seed-mutation
Seed Mutation Mutation Chems Removal
2015-11-21 21:27:21 -05:00
ZomgPonies
affdbf481c Replaced Combat & Peacekeeper borg plasma cutter with sonic jackhammer 2015-11-21 18:51:41 -05:00
ZomgPonies
66202ff4b6 Bugfixes 2015-11-21 10:46:16 -05:00
Fox McCloud
61d2ff3c4d Merge pull request #2615 from tigercat2000/md5sumgoeshere-fucknanoedition
HTML5 fixes, batch 1
2015-11-21 01:44:44 -05:00
Tigercat2000
d2ea2ae2e1 Fix pAI interface (somewhat) 2015-11-20 21:23:31 -08:00
TheDZD
843165e0e6 Merge pull request #2606 from ZomgPonies/grey
Grey verbal speech now Wingdings
2015-11-20 23:10:14 -05:00
TheDZD
0e33b7b65e Merge pull request #2610 from Fox-McCloud/bags-and-qol
Chemistry and Bio-Bags and Xenobio QoL
2015-11-20 20:45:15 -05:00
ZomgPonies
d96741eb8c Fixes copypaste procs 2015-11-20 19:52:41 -05:00
TheDZD
bbab399d6e Merge pull request #2599 from Fox-McCloud/thanksgiving-food
Thanksgiving Update
2015-11-20 19:46:47 -05:00
ZomgPonies
bd0dd2ab4b Added Peacekeeper borgs, removing thermals, giving them blue eyes, etc 2015-11-20 19:21:39 -05:00
ZomgPonies
589239f3cd Make combat borg shield only need inv to be active 2015-11-20 19:04:49 -05:00
ZomgPonies
9603d4e234 Fixes AI and robots not seeing nation HUDs 2015-11-20 18:22:07 -05:00
ZomgPonies
c51f92bf37 Adds combat droid subtype 2015-11-20 11:38:14 -05:00
ZomgPonies
e244fdb88d Gave combat borgs zipties and replaced laser with egun 2015-11-20 11:02:14 -05:00
ZomgPonies
a50882db5a Fixes ghosts not seeing nations 2015-11-19 22:04:41 -05:00
Fox-McCloud
edf2bfc4fc Chemistry and Bio-Bags and Xenobio QoL 2015-11-19 20:38:07 -05:00
TheDZD
cab49e0c83 Merge pull request #2588 from Fox-McCloud/panther
Updates Panther Sprite
2015-11-19 20:13:58 -05:00
TheDZD
cf9c41c058 Merge pull request #2595 from Fox-McCloud/painkiller-movement
Painkillers and Movement Speed
2015-11-19 20:13:14 -05:00
Fox McCloud
f52cc886b8 Merge pull request #2565 from ZomgPonies/nations
Nations 2.0
2015-11-19 19:33:21 -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
160cbf9e74 Merge pull request #2589 from Crazylemon64/miner_timestamps
Ore Reclaimer announcements are now timestamped
2015-11-19 14:29:17 -05:00
ZomgPonies
a524ce1c59 Makes grey verbal speech into wingdings 2015-11-19 13:57:54 -05:00
Tigercat2000
892610381a Fix statues causing mob process crashes
Fixed using a spawn() in Life(), not ideal, but w/e
2015-11-19 08:40:49 -08:00
Fox-McCloud
f43e21698c Updates 2015-11-18 23:17:31 -05:00
Fox-McCloud
2c6c407ada Seed Mutation Chem Removal 2015-11-18 21:15:29 -05:00
Fox-McCloud
ce16af05ef Thanksgiving Food 2015-11-18 21:11:43 -05: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
Fox-McCloud
f46ac806f8 Painkillers and Movement Speed 2015-11-18 17:58:10 -05:00
Fox-McCloud
86cdf5ec23 Fixes Health HUD Icon 2015-11-18 16:22:15 -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
54bdd47661 Merge pull request #2584 from ZomgPonies/copier
Re-added photocopying asses to refactored photocopiers
2015-11-18 12:52:42 -05:00
ZomgPonies
60aad98ef4 Cleaned up species code, remove naked requirement 2015-11-18 11:55:30 -05:00
ZomgPonies
3756d5457e Adds species-specific butts and fixes a few bugs 2015-11-18 10:16:26 -05:00
Crazylemon
646528790c Ore Reclaimer announcements are now timestamped
Did that uranium arrive just now, or with the last shipment? Now you
know!
2015-11-18 00:33:35 -08:00
Fox-McCloud
71c972d644 Updates Panther Sprite 2015-11-18 02:00:09 -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
Fox McCloud
d440f9df3f Merge pull request #2578 from FalseIncarnate/master
Overdose Change, Reagent Tweaks and Fixes, IPC Damage Fixes
2015-11-17 17:30:11 -05:00
ZomgPonies
7b2060d91a Re-added photocopying asses to refactored photocopiers 2015-11-17 10:46:04 -05:00
Fox McCloud
5526b70b96 Merge pull request #2574 from Crazylemon64/bartender_ore_announce
Uranium and plasma are now announced to the bartender
2015-11-17 08:02:04 -05: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
Aurorablade
15cfe8c4bc Second Lye recipie removed 2015-11-16 22:02:47 -05:00