Zuhayr
31a1b6e526
Fixes #5098
...
Conflicts:
code/game/objects/items/weapons/tools.dm
code/modules/power/cable.dm
2014-06-01 13:29:18 -04:00
Zuhayr
73d9498361
Drones fixes.
2014-06-01 13:26:35 -04:00
Zuhayr
777e31e222
Fixes #4973
...
Conflicts:
code/datums/spells/ethereal_jaunt.dm
2014-06-01 13:26:20 -04:00
Zuhayr
faf18ccd95
Fixes #5109
2014-06-01 13:24:59 -04:00
d3athrow
1db910ced1
telling lings they can regen
2014-06-01 13:21:00 -04:00
ZomgPonies
30ff023926
Everyone gets to see their own little nation icon.
2014-05-31 19:52:29 -04:00
ZomgPonies
5149029042
Remove debug message from liege/vassal stuff
2014-05-31 16:24:40 -04:00
Zuhayr
f367c1aef2
Drone door fix.
2014-05-31 13:45:07 -04:00
alex-gh
44f5d05537
Adds a drone spawn blurb.
2014-05-31 18:40:31 +02:00
Zuhayr
d041c7af2d
Several drone fixes (walking over, pushing, pulling, AI sync)
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2014-05-31 18:25:07 +02:00
Zuhayr
2a6cace982
Allowed drones to login to airlock electronics.
2014-05-31 18:12:04 +02:00
Zuhayr
c840622c82
Added smaller spraybottle for drones.
2014-05-31 18:11:48 +02:00
ZomgPonies
5bed3f68d8
Removed verb until I can rewrite it.
2014-05-31 11:11:33 -04:00
ZomgPonies
f0e87d4775
Merge pull request #238 from Loganbacca/nations
...
Flag capture alert fix
2014-05-31 10:54:41 -04:00
Zuhayr
31faa31f36
Fixes end of round drone spam.
2014-05-31 10:46:37 -04:00
Mloc-Argent
106fe78649
mining: fix for mining cooling down
...
Hacky thing that was already done to space. TCMB->T0C
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-05-31 10:39:20 -04:00
Loganbacca
88f96e45b0
Fixes nation change messages
2014-05-31 21:06:24 +12:00
mwerezak
41e4f59499
Vending machines can now be unanchored
2014-05-30 22:30:32 -04:00
ZomgPonies
d11c999fc2
HurrDurr
2014-05-30 22:29:11 -04:00
ZomgPonies
7078b9c30a
Igniters fix
2014-05-30 16:19:49 -04:00
ZomgPonies
b080315f48
Debug stuff removed
2014-05-30 15:29:33 -04:00
alex-gh
1dba2dd59d
Merge pull request #235 from alex-gh/uplink_greentext
...
TC use count appears on round end
2014-05-30 20:30:05 +02:00
ChuckTheSheep
7491cd7b65
TC use count appears on round end
...
Conflicts:
code/datums/uplink_item.dm
code/game/objects/items/devices/uplinks.dm
Adds Icons and purchase list
Conflicts:
code/datums/uplink_item.dm
code/game/gamemodes/traitor/traitor.dm
code/stylesheet.dm
CSS is hard
Conflicts:
code/game/gamemodes/traitor/traitor.dm
Mah Indents
Made Purchase Log Text rather than List
Conflicts:
code/game/objects/items/devices/uplinks.dm
Moved images to top "survived" line
Conflicts:
code/game/objects/items/devices/uplinks.dm
Boxes show contents
Nuke Ops Group Shaming
Conflicts:
code/game/gamemodes/nuclear/nuclear.dm
Uses compiled list for uplinks
Conflicts:
code/game/objects/items/devices/uplinks.dm
2014-05-30 20:28:35 +02:00
ZomgPonies
c470beb5c9
New recipes
2014-05-30 14:27:58 -04:00
ZomgPonies
687c46904e
SHOULD fix fueltank bomb assemblies >:D
2014-05-30 13:07:28 -04:00
Loganbacca
15566cb2a7
Farmbot fixes
...
Fixed a few bugs in the construction code, before realizing there were a lot more bugs in the move_to_target() code, giving up and disabling it pending rewrite.
2014-05-30 11:58:38 -04:00
Mike
eff5baae08
C02 -> carbon_dioxide
...
Renamed carbon dioxide breathing type string to hopefully prevent
confusion in the future.
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/species.dm
2014-05-30 11:55:42 -04:00
mwerezak
bfd2cd036c
Fixes missing 'else'
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2014-05-30 11:45:08 -04:00
mwerezak
6333840028
Adjusts co2 warning frequencies
2014-05-30 11:44:27 -04:00
mwerezak
f619e27a67
Completed unfinished species.breath_type switch
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2014-05-30 11:44:14 -04:00
mwerezak
9f0f22ec7e
New system for CO2 asphixyation
...
Too much CO2 now makes you slowly gain oxyloss instead of making you
fall unconscious immediately and quickly killing you after 30 seconds.
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2014-05-30 11:29:58 -04:00
ZomgPonies
400047c023
We use this
2014-05-30 11:22:36 -04:00
Ccomp5950
c862f131ac
Bot down? Let's not lock up the entire server.
...
Instead we'll spawn a thread to handle it, not like we care what is returned either way.
Conflicts:
code/modules/ext_scripts/irc.dm
2014-05-30 11:21:50 -04:00
d3athrow
9fe7024fd5
Lingading fixes
...
Conflicts:
code/game/gamemodes/changeling/changeling_powers.dm
html/changelog.html
2014-05-30 11:17:43 -04:00
ZomgPonies
67063dbd7f
Bleh
2014-05-30 11:13:46 -04:00
ZomgPonies
99562efb0a
Oops
2014-05-29 22:47:13 -04:00
ZomgPonies
cf061cb953
Bunch of fixes left and right, fixes script to get giant map jpg
2014-05-29 21:40:16 -04:00
d3athrow
c7992c15b8
Buff vampire blood sucking damage
2014-05-29 18:16:49 -04:00
d3athrow
bd980f155c
Some vampire fixes
...
Conflicts:
code/game/gamemodes/vampire/vampire_powers.dm
2014-05-29 18:16:03 -04:00
ZomgPonies
451e05d6bc
Final nations fixes hopefully
2014-05-29 12:54:12 -04:00
ZomgPonies
d9852332e2
Moar fixes
2014-05-29 12:27:14 -04:00
d3athrow
9e60c60ac7
Paperpocolypse changes.
2014-05-29 10:32:19 -04:00
d3athrow
c2a31713d2
spelling fixes
2014-05-29 10:32:09 -04:00
d3athrow
75514ac85a
Fix atm spamming papers
2014-05-29 10:30:21 -04:00
mwerezak
67f85eef2c
Inaprovaline no longer a substitute for breathing
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2014-05-29 10:27:18 -04:00
ZomgPonies
0d28defb2d
Oops
2014-05-29 10:24:49 -04:00
ZomgPonies
113f98a9e1
Post test #4 fixes
2014-05-29 09:52:58 -04:00
ZomgPonies
4cfc433cea
Post test #4 bugfixes
2014-05-28 19:27:48 -04:00
ZomgPonies
68dff4f876
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-05-28 18:20:36 -04:00
ZomgPonies
ea084c06eb
Post test #3 nations bugfixes
2014-05-28 18:20:22 -04:00
