cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 10:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,177 Commits 26 Branches 2 Tags
e433e0283dea9724fa7b674dd7ba002467f6583a
Commit Graph

2000 Commits

Author SHA1 Message Date
Tigercat2000
e433e0283d Add sanitizeSQL 2017-02-16 16:06:00 -08:00
Tigercat2000
1cfbeaeddb Improve View Flagged Books admin verb 
This changes the "View Flagged Books" admin verb into a datum/browser
UI. You can see all the books that have been flagged from here, review
them, and remove the flagged status or delete them.

Also refactors pencode into some __HELPER procs, and adds a
"reverse-pencode" proc. It's not perfect, due to the complexity of HTML
and my unwillingness to use BYONDregex, but it's good enough to get the
general idea of the formatting across. It's used for the new "view book"
panel.
 2017-02-12 08:44:48 -08:00
Markolie
5deafdb4e5 Fix Destroy() return, replace set_dir with setDir 2017-02-06 20:44:12 +01:00
Markolie
2b767bb9c9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/modules/mob/mob_helpers.dm
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/storage.dmi
 2017-01-31 17:44:38 +01:00
Fox McCloud
0874ea7295 Merge pull request #6152 from uraniummeltdown/windowflash 
Window Flashing
 2017-01-31 01:30:39 -05:00
Kyep
46f409ddfb Fixes some mobs being invisible in Check_antagonists 2017-01-28 15:25:20 -08:00
Markolie
a7205cfd3e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/projectiles.dmi
 2017-01-23 17:36:37 +01:00
Markolie
a50a3d59b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/__DEFINES/is_helpers.dm
#	code/_globalvars/lists/objects.dm
#	code/game/machinery/turrets.dm
#	config/example/config.txt
#	goon/browserassets/css/browserOutput.css
#	icons/obj/library.dmi
#	icons/turf/floors.dmi
 2017-01-20 23:43:35 +01:00
Crazylemon64
d945229fcb Ports over tg's map conflict helping script 2017-01-18 20:27:00 -08:00
Crazy Lemon
2a209f62cd Merge pull request #5814 from Markolie/ann2 
Announcement refactor
 2017-01-18 19:17:30 -08:00
Fox McCloud
03e3f1d624 Merge pull request #6169 from Aurorablade/KALIMAH 
Bugsie 3
 2017-01-18 18:52:19 -05:00
Aurorablade
9f1037006d Changes and more shit i noticed... 2017-01-17 23:45:47 -05:00
Aurorablade
479a82017c Merge this before i find something else.... 2017-01-16 23:55:41 -05:00
Fox McCloud
2435aa1c52 Merge pull request #6115 from tigercat2000/ooc_emoji_twemoji 
Goonchat Twemoji support.
 2017-01-15 18:13:39 -05:00
Aurorablade
90b5177f4e Rawr 2017-01-14 01:48:44 -05:00
uraniummeltdown
02b5a096de windowflash proc, windowflash on notify_ghosts, pollcandidates, adminhelp and adminpm 2017-01-12 18:55:23 +04:00
Tigercat2000
836d07189c Added config toggle + admin verb to disable OOC emoji (not PM) 2017-01-11 09:54:15 -08:00
Tigercat2000
4a6ae68fd2 Already forgot something ;) 2017-01-11 09:31:56 -08:00
Tigercat2000
0b69fe7842 Goonchat Twemoji support. 
Add twemoji support to goonchat. It only parses annotations if the message has a
<span> tag with the 'emoji_enabled' class.

Also adds utf-8 support with goonchat, for the twemoji.
 2017-01-11 09:31:56 -08:00
Crazylemon64
3c50c2f6ba Makes conveyors easier to place with buildmode, adds vars to autogibbers 
makes them kill stuff stupid fast
 2017-01-11 02:07:20 -08:00
Markolie
f4c4bfe288 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/__HELPERS/unsorted.dm
#	code/_globalvars/lists/objects.dm
#	code/controllers/verbs.dm
#	code/game/gamemodes/cult/ritual.dm
#	code/game/gamemodes/cult/runes.dm
#	code/game/objects/items/stacks/sheets/sheet_types.dm
#	code/modules/mob/spirit/mask/mask.dm
#	code/modules/mob/spirit/viewpoint.dm
#	icons/effects/96x96.dmi
#	icons/effects/effects.dmi
#	icons/mob/actions.dmi
#	icons/obj/weapons.dmi
#	icons/obj/wizard.dmi
#	icons/turf/floors.dmi
 2017-01-06 16:36:46 +01:00
Crazylemon64
4a914c2a23 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2017-01-06 05:15:11 -08:00
Fox McCloud
29ca57b4af Merge pull request #6064 from Krausus/SDQL2-client-fix 
Fixes SDQL2's client manipulation
 2017-01-06 08:09:25 -05:00
Crazylemon64
ec0f13d41e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2017-01-06 05:01:43 -08:00
Crazy Lemon
7e0183f23f Merge pull request #5224 from Kyep/jobs_unlock_system 
Playtime Tracking
 2017-01-03 18:06:28 -08:00
Krausus
6bacdf5b0f Fixes SDQL2's client manipulation 2017-01-02 22:19:52 -05:00
Aurorablade
98b7a89a17 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 
# Conflicts:
#	code/game/machinery/doors/airlock.dm
 2016-12-29 11:01:43 -05:00
Markolie
01f2c85347 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/__DEFINES/misc.dm
#	code/game/dna/genes/goon_powers.dm
#	code/game/dna/genes/vg_powers.dm
#	code/game/objects/effects/overlays.dm
#	code/game/objects/structures/crates_lockers/closets.dm
#	code/game/objects/structures/crates_lockers/closets/statue.dm
#	code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
#	icons/mob/back.dmi
#	icons/obj/storage.dmi
 2016-12-23 19:32:19 +01:00
Markolie
e2587dbbbf Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2 
# Conflicts:
#	code/game/gamemodes/events.dm
#	code/modules/awaymissions/bluespaceartillery.dm
 2016-12-23 19:04:35 +01:00
Crazylemon64
6d3e66f41c Polishes up the reset_view proc, which is basically 
`reset_perspective` from tgstation.

Also adds various support for remote viewing lenses - like cameras not
transmitting xray vision, among other things

Recommit because we're using different compiler versions
 2016-12-21 17:56:57 -08:00
Aurorablade
d9758cf31e Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into BookClub 2016-12-09 16:50:29 -05:00
Fox McCloud
d95a679273 Merge pull request #5938 from Kyep/sit_v3 
SIT/ERT Runtime fix, misc fixes
 2016-12-08 21:48:50 -05:00
Fox McCloud
287226fa19 Merge pull request #5858 from Markolie/grammarnazi 
Verb category changes, telecoms verb fix
 2016-12-07 12:33:36 -05:00
Aurorablade
81e740e6e5 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into BookClub 2016-12-06 21:51:53 -05:00
Kyep
945225b6e8 Runtime & bug fixes 
- Fixes a runtime in preferences.dm created by the Patreon PRs,
triggered when an ERT, SIT, or any other clientless mob uses
"var/datum/preferences/A = new()".
- Fixes a bug where, if a SIT is spawned with the 'choose manually'
option, one fewer person than intended is pulled in.
- Fixes syndicate headset not being included in the SIT member's notes.
- Deletes commented code.
 2016-12-03 06:24:47 -08:00
Crazy Lemon
51822ab940 Revert "Revert "Makes the admin logout tracking system actually work"" 2016-12-03 02:23:18 -08:00
Crazy Lemon
c8f54b4d53 Revert "Makes the admin logout tracking system actually work" 2016-12-03 01:53:47 -08:00
Aurorablade
fa1aa894ea Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-12-01 18:04:07 -05:00
Kyep
65761b7ac1 Adds UID support 2016-11-28 22:39:04 -08:00
Kyep
7b20d7561e Merge remote-tracking branch 'ParadiseSS13/master' into jobs_unlock_system 2016-11-28 22:19:27 -08:00
Kyep
3865213358 Crazylemon changes 
- Adds UID
- Removes cats
- Adds .Join
 2016-11-28 22:19:07 -08:00
Crazylemon64
8271a89dab Makes the admin logout tracking system actually work 2016-11-27 12:00:57 -08:00
Fox McCloud
55fc510c92 Merge pull request #5859 from Markolie/oocthrottle 
[s]Adds OOC throttling
 2016-11-24 07:46:35 -05:00
Aurorablade
0c637cebfa Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into BookClub 2016-11-22 01:48:56 -05:00
Crazy Lemon
f215041315 Merge pull request #5893 from Fox-McCloud/event-cleanup 
Removes Event Procs
 2016-11-21 16:51:16 -08:00
Fox-McCloud
9ace0245cf Removes Event Procs 2016-11-16 07:14:08 -05:00
Aurorablade
5d392b36a4 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-11-15 15:30:36 -05:00
Fox-McCloud
fcc20ac6bc BSA Tweaks 2016-11-09 22:36:03 -05:00
Markolie
75176722e7 Add OOC throttling 2016-11-08 17:01:44 +01:00
Markolie
42dd03b2cf Fix up buildmode log 2016-11-08 16:31:48 +01:00