40e1c11ee6
Fixes #1915
...
Psi gave a solution (this one) to the issue on the issue itself.
2016-06-29 18:24:30 -04:00
f75d509e7f
Ports event system from Bay
2016-06-01 22:05:04 +01:00
9e09720be5
Final Initial Implementation of Xenobio2 System.
...
Kinks worked out, everything is functioning as it should.
2016-05-25 14:11:37 -04:00
6c9346d0c4
Prevent Unexpected SQL Errors ( #1628 )
...
* Don't nag me, game.
* Added disabled message, made config consistent
* Missed adding 'else'
2016-05-14 21:09:21 -04:00
26192e2b32
Fixes an error
2016-04-20 15:36:13 +01:00
a3f8bc815e
Round start timer now remains at 0 until the round actually starts.
2016-04-20 15:27:59 +01:00
c8b510b415
Adds unit tests
...
Port of https://github.com/Baystation12/Baystation12/pull/11808 and
several others
Fixes three overlapping cables ([192 / 158 / 1], [214 / 161 / 1], [122 /
197 / 1])
Fixes drill and mech drill having the same ID.
2016-03-29 17:42:22 +03:00
8be10d96dd
Ports Byond 510 preperations from Bay
...
Updates comment
Updates supply file
2016-03-14 18:21:44 +00:00
5008120f11
add revision topic call
2016-01-09 18:12:13 +00:00
fa115aaaae
info topic improvements
2016-01-09 18:12:05 +00:00
f2cc74d588
# This is a combination of 2 commits.
...
# The first commit's message is:
Rewriting the mining turfs to reduce worldstart lag.
# This is the 2nd commit message:
Map cleanup.
2015-12-16 15:26:38 +10:30
43ab44ad62
Adds the missing cargo department to the world Topic() manifest request.
2015-12-11 21:17:27 +01:00
e52a0ea332
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
...
Conflicts:
.travis.yml
code/game/gamemodes/changeling/changeling_powers.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/turfs/simulated.dm
code/global.dm
icons/misc/fullscreen.dmi
polaris.dme
2015-10-10 23:17:26 -04:00
96a90bb5e7
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-10-04 17:41:02 +02:00
f4be4c0ad9
Merge pull request #11238 from Baystation12/master
...
Dev-freeze
2015-10-04 17:31:44 +02:00
5ef5f40cbe
add 'info' topic command to get information on a character
2015-10-02 12:45:19 +01:00
00fa623c9d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
.travis.yml
code/controllers/configuration.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/machinery/Sleeper.dm
code/game/machinery/computer/communications.dm
code/game/machinery/cryopod.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/storage/boxes.dm
code/game/turfs/simulated/floor.dm
code/game/turfs/simulated/floor_types.dm
code/global.dm
code/modules/materials/materials.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/projectiles/guns/projectile/automatic.dm
polaris.dme
2015-08-23 01:30:46 -04:00
2341d2afa9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-22 15:44:02 +01:00
4e56b82ec0
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-08-22 15:28:49 +01:00
aff57029e2
add manifest status command
2015-08-22 11:33:25 +01:00
56131e1053
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate
...
Conflicts:
code/modules/clothing/clothing.dm
2015-08-22 03:17:16 +09:30
3c477dfa5e
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/jobs/access.dm
code/modules/mob/living/carbon/brain/brain_item.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/organs/organ_icon.dm
2015-08-22 03:11:53 +09:30
c2cdf9d237
add round duration to status reply
2015-08-21 06:28:44 +01:00
a8dc3a282b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into turfs
2015-08-18 12:06:53 -07:00
71214d859e
Merge with master.
2015-08-18 11:31:10 -07:00
f0c8db3d0f
Adds settable rank to IRC messages, changes it so non-admins can see who on IRC is messaging them, and adds the name of the original sender to reply PMs
2015-08-18 02:16:50 +01:00
c8baafed2a
Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and
...
construction/deconstruction. Major map rework/changes.
2015-08-16 06:05:21 -07:00
3a08e2884a
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/structures/crates_lockers/largecrate.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/research/circuitprinter.dm
2015-08-15 10:52:17 +02:00
74f47de0e5
'fixes' spacestation13.com's server banner
...
they appear to just use the 8th field of the reply for the player count, rather than parsing the reply; this moves player count back to being the 8th entry
2015-08-15 03:18:40 +01:00
4440732b45
Closes a ), so the code compiles.
2015-08-09 06:00:13 -04:00
88270df755
Refactors the map generation to not assume the fifth z-level is mining. Now it checks the config.txt.
2015-08-09 05:49:25 -04:00
93e914f021
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/setup.dm
2015-07-30 10:49:37 +02:00
b6bd51828a
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/robot/robot_upgrades.dm
code/modules/admin/admin_verbs.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Recipes.dm
code/modules/reagents/reagent_containers/syringes.dm
2015-07-30 10:38:44 +02:00
2cf4f6e4db
Change Topic() 'status' command to make more sense
2015-07-29 06:39:03 +01:00
c6f4f7fcee
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-07-12 15:14:43 +02:00
7b3759c1f3
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/controllers/configuration.dm
code/modules/admin/topic.dm
config/example/config.txt
2015-07-12 14:49:31 +02:00
a28d3cd9d1
Added new config variables for toggling moderator tempban permissions and maximum duration for bans.
2015-07-09 12:10:18 -07:00
f25e8a7a67
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/stacks/tiles/plasteel.dm
code/game/objects/items/stacks/tiles/tile_types.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/pai/pai.dm
code/modules/surgery/implant.dm
code/setup.dm
2015-06-26 20:28:47 +02:00
6c891406f9
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/update_icons.dm
code/setup.dm
2015-06-26 19:22:31 +02:00
5906ae7556
Adds 'age' command to world.Topic, for the IRC bot. Also runs all keys through ckey() before using them, to avoid easily-fixed errors
2015-06-25 22:52:36 +01:00
ad0652d864
Moved some stuff from global.dm into defines files that fit the theme, some into files where they are used (and only there, much global). Axed some obsolete stuff (rip Debug var).
2015-06-04 22:51:15 +03:00
ebe62cefd8
Refactored random map generator system and added several terrain generators.
...
Created a global list to track base turfs for explosions/shuttle moves.
Remaps the asteroid to be a moonlet. Tidies up some references to 'asteroid', removes moonbase from the accessible z level list.
2015-06-03 04:36:19 +09:30
6b85a13de7
Merge remote-tracking branch 'upstream/dev' into chem-kinetics
...
Conflicts:
code/modules/reagents/Chemistry-Recipes.dm
2015-05-30 17:25:57 -04:00
98c585615e
Inactivity process tweaks.
...
Partially by request:
The inactive check process now respects client holder status and can be configured how long clients may remain inactive before being kicked.
2015-05-26 09:04:26 +02:00
b72abc8b64
Chem reaction cleanup
...
Reorganizes handle_reactions() in preparation for implementing
reactions-over-time.
Moves chemistry initializations into global_init.
2015-05-22 19:45:31 -04:00
bc50ba5166
Merge resolution.
2015-05-11 11:47:24 +09:30
79e3acc95e
Finalized wall refactor.
2015-04-26 12:58:57 +09:30
1ae0ad6d92
Updates the atom_pool, now datum_pool, to handle any datum object.
...
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
8f242740a8
Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs.
2015-03-28 11:01:11 +10:30
3718245e45
Moves asteroid generation prior to geometry initialization. Adds config for asteroid generation.
2015-03-21 11:13:53 +10:30
Datraen