PsiOmegaDelta
96a90bb5e7
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-10-04 17:41:02 +02:00
PsiOmegaDelta
f4be4c0ad9
Merge pull request #11238 from Baystation12/master
...
Dev-freeze
2015-10-04 17:31:44 +02:00
GinjaNinja32
5ef5f40cbe
add 'info' topic command to get information on a character
2015-10-02 12:45:19 +01:00
Neerti
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
GinjaNinja32
2341d2afa9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-22 15:44:02 +01:00
GinjaNinja32
4e56b82ec0
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-08-22 15:28:49 +01:00
GinjaNinja32
aff57029e2
add manifest status command
2015-08-22 11:33:25 +01:00
Zuhayr
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
Zuhayr
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
GinjaNinja32
c2cdf9d237
add round duration to status reply
2015-08-21 06:28:44 +01:00
Zuhayr
a8dc3a282b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into turfs
2015-08-18 12:06:53 -07:00
Zuhayr
71214d859e
Merge with master.
2015-08-18 11:31:10 -07:00
GinjaNinja32
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
Zuhayr
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
PsiOmega
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
GinjaNinja32
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
Neerti
4440732b45
Closes a ), so the code compiles.
2015-08-09 06:00:13 -04:00
Neerti
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
PsiOmegaDelta
93e914f021
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/setup.dm
2015-07-30 10:49:37 +02:00
PsiOmegaDelta
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
GinjaNinja32
2cf4f6e4db
Change Topic() 'status' command to make more sense
2015-07-29 06:39:03 +01:00
PsiOmegaDelta
c6f4f7fcee
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-07-12 15:14:43 +02:00
PsiOmegaDelta
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
Null Snapshot
a28d3cd9d1
Added new config variables for toggling moderator tempban permissions and maximum duration for bans.
2015-07-09 12:10:18 -07:00
PsiOmega
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
PsiOmega
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
GinjaNinja32
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
Chinsky
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
Zuhayr
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
mwerezak
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
PsiOmega
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
mwerezak
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
Zuhayr
bc50ba5166
Merge resolution.
2015-05-11 11:47:24 +09:30
Zuhayr
79e3acc95e
Finalized wall refactor.
2015-04-26 12:58:57 +09:30
PsiOmega
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
Zuhayr
8f242740a8
Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs.
2015-03-28 11:01:11 +10:30
Zuhayr
3718245e45
Moves asteroid generation prior to geometry initialization. Adds config for asteroid generation.
2015-03-21 11:13:53 +10:30
Graham Lloyd
160183ebd5
finishes work on adapting the goon process scheduler for BS12.
2015-03-04 05:14:36 -05:00
Zuhayr
5890fa3c4b
Added plant controller.
2015-02-05 15:53:20 +10:30
Zuhayr
20da84646b
Merge pull request #7964 from Baystation12/dev-freeze
...
Dev-Freezer -> Master v0.1.17 Botswan Punchout
2015-02-02 02:14:08 +10:30
rahlzel
7adcb95f85
Fixes #7969
...
I have no idea why this works, but it does.
Credit to GinjaNinja32 for this.
2015-01-27 20:29:15 -05:00
Zuhayr
8978747e53
Moved several globals into the config controller, updated eample config appropriately.
2014-12-25 21:10:30 +10:30
Zuhayr
844c795c7a
Removed unused log var (diaryofmeanpeople).
2014-12-25 20:28:03 +10:30
mwerezak
168cabf03a
Fixes manual runtimes without modifying the construction of every object
...
Loads configuration before map creation instead.
This reverts commit 37b14bae39
2014-12-13 09:35:36 -05:00
PsiOmegaDelta
a90dc80bb8
Merge pull request #7127 from Zuhayr/lathe
...
Generalizing lathe recipes.
2014-11-25 10:43:03 +01:00
Zuhayr
2b93a89d51
Generalizing lathe recipes.
2014-11-24 17:31:15 +10:30
mwerezak
feaa27fff1
Cleans up monkey initialization
2014-11-23 13:44:59 -05:00
Zuhayr
ca13d1d5d8
Fixes chem splicing, bioluminescence and seed packets for xenobotany.
2014-10-15 10:05:50 +10:30
Chinsky
03cdfaf896
Changed /area to /area/space to get rid of anicent and terrible strict typechecks every time you needed to check if it's space area.
2014-08-16 05:28:45 +04:00
Boop
d2e81da90c
Fixes #4756
...
removes the getrev stuff because it's svn and old and I couldn't get tg's stuff to work :c
2014-06-17 17:25:57 +01:00
