cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-27 10:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,512 Commits 26 Branches 2 Tags
732c3b4ae5fa94de9a3cd900fed520a73d1273d2
Commit Graph

49 Commits

Author SHA1 Message Date
tigercat2000
732c3b4ae5 Goonchat (#4744) 
* bicon regex run

* Remove all \black

* Goonchat from /vg/ / Goon

Whoo!
Special thanks to @Tastyfish for the macro2html thing so all of our
horrible color macros keep working and don't fail horribly <3

* Fixes and changes n stuff

- Made ping sane again (the fuck PJ)
- Updated chat CSS
- Fixed like one problem with a color macro

* whoops

* Restore /vg/'s pingloop stuff (used to avoid fucking up is_afk)

* Strip problematic tags from tcomm scripts

- <audio>
- <video>
- <iframe>
- <script>

* Fix human examine icon

* Name hotkey elements

* Removed old stylesheet
 2016-06-23 16:56:15 -04:00
Tigercat2000
78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000
9d430844c3 Replace most (if not all) output << operators with to_chat(user, message) 
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
 2016-04-05 08:15:05 -07:00
Tigercat2000
519992b5a9 Merge branch 'byond510' 
Conflicts:
	.travis.yml
	code/game/jobs/access.dm
	code/game/machinery/camera/camera.dm
	code/game/machinery/flasher.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/laserpointer.dm
	code/game/objects/items/weapons/grenades/flashbang.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/nano/modules/virus2_creator.dm
	code/modules/virus2/disease2.dm
	code/modules/virus2/diseasesplicer.dm
	paradise.dme
 2016-04-01 14:15:44 -07:00
Fox-McCloud
bc639a357c more sounds 2016-03-08 22:35:31 -05:00
Tigercat2000
976887b2e0 Replace text2list and list2text 2016-02-28 12:07:19 -08:00
Tastyfish
50d0d0c5e0 Paid vending machines usable by borgs too 2016-02-17 18:07:23 -05:00
Tigercat2000
9cb84e83ca Clean old shit, delete old files, move files, mrowl 2015-12-27 15:58:41 -08:00
Tastyfish
88b933e8a0 Made slot machine have reactive ui, use bank correctly 2015-12-10 17:35:32 -05:00
Certh
591daf04d2 Corrected the capitalization of a large amount of machines and items. This will also cause BYOND to use the correct articles (a/an). 
Also corrected some periods, spelling errors etc. along the way.

If this PR seems familiar, a part of this is of an earlier PR that I messed up.
 2015-12-07 16:14:26 +01:00
Tastyfish
280fc65938 added cancel to more powers, hand tele, cleanups to others 2015-11-30 22:30:57 -05:00
Tastyfish
e2f67a4260 fixed various inputs to be cancel-able 2015-11-30 01:06:20 -05:00
Tastyfish
d0a16cb489 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-10-28 19:02:27 -04:00
Tastyfish
6fc9950e45 Gave space cash a proc get_total() to return value of stack, and fixed richest escapee scoreboard line to actually get bank account (was ref'ing phantom var) and get cash amount correctly. 2015-10-28 18:49:14 -04:00
Markolie
f9adb09c72 Drone message fix, let robots unbuckle 2015-10-05 19:37:35 +02:00
Markolie
727e1271b0 Missing variable 2015-09-22 01:51:28 +02:00
Markolie
dc70ec8e8b Accounts database fix 2015-09-22 01:38:41 +02:00
Markolie
145d1dc5ec Accounts database fixes 2015-09-14 02:04:07 +02:00
Markolie
26d0ad3071 Radio access update 2015-09-04 19:29:56 +02:00
Markolie
5e95ae82b4 Bluespace artillery computer update, accounts database computer update, ghost machinery interaction update 2015-08-14 06:26:40 +02:00
DZD
d9bb30f47a Replaces typesof with subtypesof where applicable 2015-08-03 11:04:28 -04:00
Fox-McCloud
728dc57f30 Re-Enables News 2015-07-17 00:09:14 -04:00
Fox-McCloud
54f59b9899 Pass II 2015-07-09 19:51:40 -04:00
Markolie
9c54d2feaa Central Command access rework 2015-03-04 16:36:17 +01:00
Markolie
672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
Markolie
ad167dc541 Announcement system overhaul, crew monitor system overhaul, add portable crew monitor 2015-02-16 19:03:29 +01:00
Markolie
71319538df Vending machine overhaul, teleporter area fix, add events to status tab 2015-02-13 15:27:42 +01:00
Fox-McCloud
94eccfffcc MetaToys 2015-02-06 23:25:13 -05:00
Markolie
afac549c39 Revert economy changes, quarantine law fix 2015-02-02 20:02:29 +01: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
ZomgPonies
ae02ebb446 Economy Changes Phase 1 2015-01-30 23:59:27 -05:00
Markolie
09321d6c0b Use station_name proc where possible, mapfix 2015-01-21 23:37:05 +01:00
Fox-McCloud
098998ac89 Science Station 2015-01-18 21:43:40 -05:00
Markolie
bd11c78235 Replace every instance of NanoTrasen with Nanotrasen. 2014-11-29 21:01:29 +01:00
d3athrow
6a4866e199 Fix POS not opening the menu when you slap with your ID and make it not show the [user] attacked the thing with your ID as well. 2014-07-17 05:38:43 -04:00
Mark Aherne
9b45dbabfb Continued work in progress on a major revision of the NanoUI templating system. 
Conflicts:
	code/ATMOSPHERICS/components/omni_devices/filter.dm
	code/ATMOSPHERICS/components/omni_devices/mixer.dm
	code/game/dna/dna_modifier.dm
	code/game/machinery/cryo.dm
	code/game/machinery/kitchen/smartfridge.dm
	code/modules/nano/nanoexternal.dm
	code/modules/nano/nanomanager.dm
	code/modules/nano/nanoui.dm
	code/modules/power/apc.dm
	code/modules/power/smes.dm
	code/modules/reagents/Chemistry-Machinery.dm
	nano/css/shared.css
	nano/js/nano_update.js
	nano/templates/escape_pod_console.tmpl
 2014-07-15 07:22:15 -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
Necaladun
ce4066c936 Minor map tweaks and NGS-> NCS 2014-06-27 05:30:52 +09:30
ZomgPonies
4fc76945af Compile fix 2014-06-23 06:31:20 -04:00
ZomgPonies
2fd3ad5802 NSS Cyberiad to NGS Cyberiad 2014-06-21 17:02:35 -04:00
d3athrow
9e60c60ac7 Paperpocolypse changes. 2014-05-29 10:32:19 -04:00
d3athrow
75514ac85a Fix atm spamming papers 2014-05-29 10:30:21 -04:00
ZomgPonies
0b2fd89f55 Hopefully fix vending machines 2014-05-24 13:49:21 -04:00
ZomgPonies
408379ab6a vg economy overhaul 2014-05-20 22:51:02 -04:00
Jeremy Liberman
bd249e3a53 Mutiny Mode 
Conflicts:
	code/__HELPERS/time.dm
	code/controllers/hooks-defs.dm
	code/controllers/hooks.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/podmen.dm
	code/modules/admin/player_panel.dm
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/login.dm
	code/modules/mob/mob.dm
	code/modules/security levels/keycard authentication.dm
	code/setup.dm
	icons/mob/mob.dmi
 2014-05-15 01:01:54 -04:00
Rob Nelson
56d8ce28c8 Part 1 of economy rework: Spacecash refactor - See commit for full changelog. 
* Implements stacking and stack overlays
 * Simplified tiers of cash (1,10,100,500,1000, may remove 500)
 * Simplified API (dispense_cash, count_cash)

Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/admin/verbs/debug.dm
	code/modules/economy/ATM.dm
 2014-04-19 20:47:41 -04:00
ZomgPonies
3273ab1418 Econ and hud fixes 2013-11-25 06:12:56 -05:00