cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
16,789 Commits 14 Branches 2 Tags
048ac0994da54ea89ef1aeb9e2a5dda7b482f04d
Commit Graph
16789 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
d3athrowandZomgPonies 7fc78dd74e Fix thrall going despite implants. 2014-06-02 13:49:36 -04:00
ZomgPonies 9d0f4680fc Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-02 13:45:13 -04:00
ZuhayrandZomgPonies 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 d95c29a867 Merge pull request #241 from alex-gh/stunbeam_nodamage 
Stunbeam tweaks and fixes.
 2014-06-02 09:56:10 +02:00
alex-gh 5555974634 Stunbeams should be effective against janicarts again 2014-06-02 09:53:30 +02: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 4f1140c115 Fix some seed issues? 2014-06-01 21:54:28 -04:00
ZomgPonies 9a8b636123 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-01 21:37:52 -04:00
ZomgPonies d49a489cb2 Derp 2014-06-01 21:37:35 -04:00
alex-gh 4d71216d36 Merge pull request #240 from alex-gh/bs12_cherrypicks4 
Fixes runtime logging and makes it a config option.
 2014-06-02 02:57:15 +02:00
Mloc-Argentandalex-gh b5f3379a0f Fixes runtime logging and makes it a config option. 
Option starts off by default, since that could be seen as the original behavior...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/controllers/configuration.dm
	config/example/config.txt
 2014-06-02 02:43:43 +02:00
ZomgPonies 7a9f6f6449 More nations fixes 2014-06-01 16:17:06 -04:00
ZomgPonies 5351b1241b Finalize Nations Status command 2014-06-01 14:19:25 -04:00
ZuhayrandZomgPonies 8769c924c5 Typo. 2014-06-01 13:29:34 -04:00
ZuhayrandZomgPonies 31a1b6e526 Fixes #5098 
Conflicts:
	code/game/objects/items/weapons/tools.dm
	code/modules/power/cable.dm
 2014-06-01 13:29:18 -04:00
ZuhayrandZomgPonies 73d9498361 Drones fixes. 2014-06-01 13:26:35 -04:00
ZuhayrandZomgPonies 777e31e222 Fixes #4973 
Conflicts:
	code/datums/spells/ethereal_jaunt.dm
 2014-06-01 13:26:20 -04:00
ZuhayrandZomgPonies faf18ccd95 Fixes #5109 2014-06-01 13:24:59 -04:00
d3athrowandZomgPonies 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
ZuhayrandZomgPonies f367c1aef2 Drone door fix. 2014-05-31 13:45:07 -04:00
alex-gh d5d741fd12 Merge pull request #239 from alex-gh/drone_fixes_z 
Drone fixes
 2014-05-31 18:43:53 +02:00
alex-gh 44f5d05537 Adds a drone spawn blurb. 2014-05-31 18:40:31 +02:00
Zuhayrandalex-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
Zuhayrandalex-gh 2a6cace982 Allowed drones to login to airlock electronics. 2014-05-31 18:12:04 +02:00
Zuhayrandalex-gh 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
ZuhayrandZomgPonies 31faa31f36 Fixes end of round drone spam. 2014-05-31 10:46:37 -04:00
Mloc-ArgentandZomgPonies 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
mwerezakandZomgPonies 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
ChuckTheSheepandalex-gh 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
LoganbaccaandZomgPonies 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
MikeandZomgPonies 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
mwerezakandZomgPonies bfd2cd036c Fixes missing 'else' 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2014-05-30 11:45:08 -04:00
mwerezakandZomgPonies 6333840028 Adjusts co2 warning frequencies 2014-05-30 11:44:27 -04:00