Markolie
c89e3ac1eb
Revert "Revert "Emergency communications hotfix""
...
This reverts commit 3ea36839a8
2015-02-20 17:59:07 +01:00
Markolie
d8d1670b68
Revert "Revert "Saycode/language/species port from Bay""
...
This reverts commit d54579850c
2015-02-20 17:46:35 +01:00
ZomgPonies
d54579850c
Revert "Saycode/language/species port from Bay"
2015-02-19 20:15:42 -05:00
ZomgPonies
043a5e0e31
Merge pull request #331 from Markolie/master
...
Saycode/language/species port from Bay
2015-02-19 19:07:25 -05:00
Markolie
46c53be6f1
Part 2 of saycode/language/species port from Bay. Also includes bugfixes.
2015-02-20 00:50:28 +01:00
Markolie
21926c9e48
Part 1 of saycode/language/species port from Bay
2015-02-17 23:20:50 +01:00
ZomgPonies
8a0d5f05d8
Merge pull request #322 from Markolie/master
...
Refactor announcement system, crew monitor overhaul, z-level checks, add portable crew monitor, fixes
2015-02-17 14:05:49 -05:00
ZomgPonies
03a08e931a
Fixes problem with sound toggles.
2015-02-17 04:55:18 -05:00
Markolie
f590c215b7
Comma fix
2015-02-17 01:04:38 +01:00
Markolie
d7f17f6eba
Bug fixes, give roboticist toolbelt, AI recall shuttle option
2015-02-17 01:04:04 +01:00
Markolie
4e2694cc03
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
2015-02-12 19:11:35 +01:00
Markolie
3f80f66411
Simplify get_candidates, minor adjustment to antag ages
2015-02-12 19:09:05 +01:00
ZomgPonies
236552fb81
Fixes Alternate Job Titles
2015-02-10 05:18:59 -05:00
Markolie
86dd7782d5
Add cyborg latejoining
2015-02-05 14:27:39 +01:00
Markolie
afac549c39
Revert economy changes, quarantine law fix
2015-02-02 20:02:29 +01:00
Markolie
8fb90212b8
Blob event fixes, toggle preferences age check, jobban check
2015-02-01 14:19:11 +01:00
Fox-McCloud
0d7c972084
Merge pull request #238 from Markolie/master
...
Mapfix, dbconfig update, sec camera template network fix, code cleanup, additional jobbans, antag minimum age
2015-01-31 19:54:51 -05:00
ZomgPonies
8049264b1c
Default_slot fixes.
2015-01-31 19:07:20 -05:00
ZomgPonies
b5e66de4c3
Econ Phase 1 Bugfix: Fixes people with random names spawning with no ID
2015-01-31 17:15:51 -05:00
Markolie
c520856716
Additional jobban options, minimum account age for antags
2015-01-31 19:48:48 +01:00
DZD
bee904d99f
Paperwork NT Logo Fix
...
- Fixes the problem where the image for using [logo] in paperwork was
not appearing correctly.
2015-01-13 17:08:55 -05:00
Markolie
60e18d0c0e
Major map overhaul, remove customs officer/nanotrasen recruiter
2015-01-12 02:23:45 +01:00
Markolie
ced499edc3
Vox Heist port from Bay
2015-01-10 06:21:21 +01:00
Markolie
c1b48b40b7
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/modules/client/preferences.dm
2015-01-06 23:40:34 +01:00
Markolie
3f8c04686d
Vox trader changes
2015-01-06 23:36:26 +01:00
Markolie
2e37a88639
More verb fixes
2015-01-06 22:46:11 +01:00
Fox-McCloud
f735fb3d5e
Merge pull request #121 from PJB3005/AZERTY
...
more advanced hotkey mode system + AZERTY hotkey mode
2015-01-05 22:57:10 -05:00
Fox-McCloud
d70cda53e2
Merge pull request #87 from PJB3005/voxmasterrace
...
Old vox choice
2015-01-05 22:57:03 -05:00
PJB3005
6a9f183a5c
adv. hotkey mode code + AZERTY support
...
Adds a more advanced hotkey mode system, using verbs instead of .dmf
defined .winset commands, allowing for multiple hotkey presets(QWERTY,
AZERTY, DVORAK, you name it)
Adds an AZERTY set of hotkeys, using this code
2014-12-28 15:26:32 +01:00
Markolie
037f7e71b8
Talisman image
2014-12-21 16:38:23 +01:00
Markolie
17ae62bc99
Karma refund option, IPC radiation checks
2014-12-20 20:45:31 +01:00
Markolie
da8115dc2e
Bug fixes
2014-12-20 16:27:33 +01:00
PJB3005
67c1b34aae
oops, I forgot a thing
2014-12-18 13:04:54 +01:00
PJB3005
a272cb2626
Old vox choice
2014-12-17 14:18:57 +01:00
Markolie
37b86cd8f1
Xenos gamemode rework
2014-12-13 02:08:22 +01:00
Fox-McCloud
cd6814e380
Merge pull request #48 from Markolie/master
...
Add clothing vendors to cargo, fix syndiborg/dsborg, laptop fix, other minor fixes
2014-12-06 22:59:38 -05:00
Markolie
b8a440f23a
Add clothing vendors to cargo, fix syndiborg/dsborg, laptop fix, other minor fixes
2014-12-07 04:55:48 +01:00
Fox-McCloud
21a1c0bc83
Stunning Changes
2014-12-06 02:33:31 -05:00
Markolie
cb7676c139
Re-add stamp images, add more holopads
2014-12-03 02:53:26 +01:00
ZomgPonies
bdb35c7b3a
MySQL fixes
2014-08-16 18:12:44 -04:00
JimTheCactus
7304682f62
Changes check to an isnull rather than a truth test
...
This allows the client to detect the difference between a blank and someone pressing cancel.
2014-07-27 14:44:05 -04:00
JimTheCactus
b23f424ed1
Added check for blank on name entry
...
Since cancel just returns a blank this checks for that and doesn't raise an error.
2014-07-27 14:43:53 -04:00
Zuhayr
ebb9f724aa
Hydroponics rewrite, details will be in PR. Big commit.
...
Conflicts:
baystation12.dme
code/controllers/master_controller.dm
code/game/gamemodes/events/spacevines.dm
code/game/machinery/seed_extractor.dm
code/modules/mob/living/carbon/brain/posibrain.dm
code/modules/mob/mob.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/food/snacks/grown.dm
icons/obj/hydroponics.dmi
maps/tgstation2.dmm
2014-07-25 11:10:01 -04:00
ZomgPonies
8fc1cc3024
Remove RadioChatter toggle as redundant and broken. Ghosts can use GhostRadio toggle while players can turn off their headsets ICly.
2014-07-24 16:35:22 -04:00
ZomgPonies
ce04d9551c
Added NT Recruiter and Sec Pod Pilot karma jobs
2014-07-13 22:34:06 -04:00
GinjaNinja32
56615e9170
Fix Change UI verb
2014-07-13 07:13:10 -04:00
ZomgPonies
ab32000c2a
Finally fixes lobby jukebox
2014-06-29 16:44:42 -04:00
ZomgPonies
399e4909d6
The death of assistants. Long live civilians!
2014-06-27 17:57:18 -04:00
ZomgPonies
cb9b6fca4d
Replacing civilian with support department. Still need to make changes on MySQL schema.
2014-06-26 19:42:14 -04:00
ZomgPonies
23d6889a28
Trying to fix lobby jukebox
2014-06-25 13:19:56 -04:00
