ZomgPonies
048ac0994d
2nd commit of MySQL conversion. So close to the finish line.
2014-06-03 03:31:06 -04:00
ZomgPonies
59f63f6413
First commit converting playerfiles to MySQL
2014-06-02 22:02:15 -04:00
ZomgPonies
9d0f4680fc
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-06-02 13:45:13 -04:00
Zuhayr and ZomgPonies
7e1ba654e3
Fixes a minor icon-flicker thing with the drone fabricator.
...
Conflicts:
code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
2014-06-02 13:44:55 -04:00
alex-gh
0eed06bcc9
Stunbeams should no longer destroy computers
2014-06-02 09:49:58 +02:00
ZomgPonies
ae9658e4bd
Final nations fixes, pretty sure this time.
2014-06-02 00:47:04 -04:00
ZomgPonies
196cffd768
Out of bound THIS
2014-06-01 23:21:42 -04:00
ZomgPonies
8069519686
Fixed nymph messages to make them clearer
2014-06-01 22:39:57 -04:00
ZomgPonies
210e80fc86
Fuck nymph griff!
2014-06-01 22:27:02 -04:00
ZomgPonies
d49a489cb2
Derp
2014-06-01 21:37:35 -04:00
ZomgPonies
7a9f6f6449
More nations fixes
2014-06-01 16:17:06 -04:00
Zuhayr and ZomgPonies
8769c924c5
Typo.
2014-06-01 13:29:34 -04:00
Zuhayr and ZomgPonies
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 and ZomgPonies
73d9498361
Drones fixes.
2014-06-01 13:26:35 -04:00
Zuhayr and ZomgPonies
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 and alex-gh
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 and alex-gh
c840622c82
Added smaller spraybottle for drones.
2014-05-31 18:11:48 +02:00
Mloc-Argent and ZomgPonies
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
ZomgPonies
d11c999fc2
HurrDurr
2014-05-30 22:29:11 -04:00
ZomgPonies
7078b9c30a
Igniters fix
2014-05-30 16:19:49 -04:00
ZomgPonies
687c46904e
SHOULD fix fueltank bomb assemblies >:D
2014-05-30 13:07:28 -04:00
Mike and ZomgPonies
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 and ZomgPonies
bfd2cd036c
Fixes missing 'else'
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2014-05-30 11:45:08 -04:00
mwerezak and ZomgPonies
6333840028
Adjusts co2 warning frequencies
2014-05-30 11:44:27 -04:00
mwerezak and ZomgPonies
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 and ZomgPonies
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 and ZomgPonies
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
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
ZomgPonies
d9852332e2
Moar fixes
2014-05-29 12:27:14 -04:00
d3athrow and ZomgPonies
9e60c60ac7
Paperpocolypse changes.
2014-05-29 10:32:19 -04:00
d3athrow and ZomgPonies
c2a31713d2
spelling fixes
2014-05-29 10:32:09 -04:00
d3athrow and ZomgPonies
75514ac85a
Fix atm spamming papers
2014-05-29 10:30:21 -04:00
mwerezak and ZomgPonies
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
113f98a9e1
Post test #4 fixes
2014-05-29 09:52:58 -04:00
Zuhayr and ZomgPonies
047f0bdd67
Fixes #4643
...
Conflicts:
code/modules/mob/living/simple_animal/hostile/mimic.dm
2014-05-28 08:51:44 -04:00
Chinsky and ZomgPonies
d37e54bf73
Added new BBCode tags, for tables and NT logo. Removes html support from paper.
...
Conflicts:
html/changelog.html
2014-05-28 08:49:24 -04:00
ZomgPonies
5f67943f8e
Revert "APC bugfix after someone messed with mah areas!"
...
This reverts commit ceca0ddbe8
2014-05-27 21:22:53 -04:00
ZomgPonies
2383017de1
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-05-27 20:09:39 -04:00
ZomgPonies
06bbfcf150
Final Nations patch before live testing. This is going to be painful.
2014-05-27 20:09:10 -04:00
alex-gh
21bd350299
Removed AI lawsync for drones
2014-05-27 23:31:14 +02:00
d3athrow and ZomgPonies
8db91a3273
Image pooling for human unconscious/oxygenloss/fire&bruteloss screen overlays.
2014-05-27 14:20:55 -04:00
d3athrow and ZomgPonies
f3d3bd620f
Should fix #727 for humans and monkeys.
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2014-05-27 14:16:24 -04:00
mwerezak and ZomgPonies
3a2da98639
More sensible oxyloss scaling
2014-05-27 14:07:27 -04:00
mwerezak and ZomgPonies
ca176b63f5
Fixes inhale_pp ratio
...
The amount of inhaled gas used shouldn't approach infinity as inhale_pp
goes to zero, should it?
Also the amount of gas used should decrease with inhale_pp as the
oxyloss is being caused by the fact that fewer moles are entering the
bloodstream.
2014-05-27 14:07:18 -04:00
ZomgPonies
9741799733
More work on nations, got most of the flag procs ready. Really missing the vassalage system.
2014-05-27 10:35:09 -04:00
Ccomp5950 and ZomgPonies
ceca0ddbe8
APC bugfix after someone messed with mah areas!
...
This was probably bound to happen either way the previous version was based upon a faulty understanding of how the areas worked this is much more robust and only messes with the master areas
and master areas needing power updates call power updates for the each of it's child areas. Also added where messing with SMESes called for an update on all areas power consumption, probably
not required but doing so either way.
We also rebuild the active_areas list every 5 minutes, if you get a engineer that wants to build a new area off of the station with APC's set rebuild_all_areas in the master controller and it will
update instantly, otherwise wait 5 minutes. The only downside to this 5 minutes is you might get free energy until that area becomes active.
Conflicts:
code/controllers/master_controller.dm
code/modules/power/apc.dm
2014-05-27 00:28:31 -04:00
ZomgPonies
53090e314d
Second commit for nations, respawning is in, splitting in teams is in. Time to get to work on the actual capture mechanics.
2014-05-26 21:33:46 -04:00
ZomgPonies