cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-07 21:25:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,199 Commits 9 Branches 2 Tags
355666e1a825252a4d08fa4e5cfced85e107ce39
Commit Graph

17074 Commits

Author SHA1 Message Date
Cael_Aislinn eb02fb3636 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	baystation12.dme
	code/modules/events/event_manager.dm
	code/modules/events/ion_storm.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-11 02:56:07 +10:00
Cael_Aislinn f29c19e52c added global PM visibility for mods 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-11 02:51:55 +10:00
Cael_Aislinn 0dde35b385 unique voice text colour for soghun, skrell and taj 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-10 22:36:23 +10:00
Cael_Aislinn 28b5096ab3 players can choose the bottle icon of new pill bottles, forgot to save map 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-10 21:55:40 +10:00
Cael_Aislinn c05b9869e6 restructured/cleaned up how admin-pms are sent (retained original code just in case), made it so that only holders with R_ADMIN can see private messages, added a timeout warning to anyone PMing a player so they dont get spammed (default to 5 seconds, config edited) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-10 21:29:02 +10:00
Cael_Aislinn 6668458b09 fixed some admin colour OOC bugs, restructured/cleaned up how OOC messages are sent (retained original code commented out, in case) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-10 21:27:54 +10:00
Cael_Aislinn 0ad89c7953 removed moderators from adminwho, added new globally accessible verb to show online moderators 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-10 21:25:29 +10:00
Cael_Aislinn 15bc6ed7b2 restructured event system, re-merged CIB's event system with TG's 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-10 21:24:31 +10:00
Cael_Aislinn 6443eeaa7a made carp and giant spiders not carve sections out of the station, removed meese's universal speak 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-10 21:23:37 +10:00
Cael_Aislinn 5b0f31e89f tweaked, reworked and restructured a bunch of events, fixed the capitalisations issue in my repo structure 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-10 21:22:02 +10:00
Cael_Aislinn 4500be323c removed unused event files, added some new events from unused ones, restructured/tweaked some event procs 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-10 21:12:40 +10:00
Chinsky 6b10b8a564 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-02-09 23:57:10 +04:00
Chinsky 2b7da59f1f Readded limb cutoff surgery. 2013-02-09 22:43:39 +04:00
Chinsky 7aa175b444 readded painkillers YET AGAIN 2013-02-09 22:10:50 +04:00
Chinsky 18932d79ac bad indentation on one of cocktails 2013-02-09 22:06:19 +04:00
Chinsky f13fc01dbf Merge pull request #2285 from caelaislinn/bleeding-edge-freeze 
Merge from master, post TG update feedback
 2013-02-09 09:50:37 -08:00
Chinsky 839500c8fb Fixed msay links. 2013-02-09 21:42:52 +04:00
cib 934eae1d15 Removes new event code and reinstates old event code. 2013-02-09 18:38:35 +01:00
cib 9fa8509569 Virus event is now again virus2. 2013-02-09 18:04:24 +01:00
cib 863a9deb7b Added NT relation preference. 2013-02-09 17:55:53 +01:00
Cael_Aislinn b2e9c265c4 new icons, added some large artifacts, renamed/restructured a bunch of files 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-10 01:30:40 +10:00
RavingManiac b600b54f61 Traitor's revolver is now w_class=2.0 (pocketable). Sprite is now that of a snub-nosed revolver. 2013-02-09 20:24:29 +08:00
Gamerofthegame ead9a020bf I am tired of doing this 2013-02-08 17:46:05 -05:00
Cael_Aislinn f6d3114d6e mice no longer have universal speak, carp and giant spiders will no longer carve through the station, removed unused item 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-09 01:13:30 +10:00
Cael_Aislinn c490357f4a tweaks to a couple of random events, removed spider infestation and alien infestation from random list 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-09 01:11:36 +10:00
Cael_Aislinn 84877454ed removed old event files, re-added old ion storm 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-09 01:08:59 +10:00
Cael_Aislinn 5533ef4946 setup digsite creation + propogation on mining asteroid, setup most excavation and tool interaction with mining turfs + digsites, setup tweaked list operation, modified dme 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-08 23:54:45 +10:00
Cael_Aislinn 3c24a9088d tweaked fossils and arch. finds, added find -> reagent linking, added / tweaked linking between geosample + finds + reagents + analysis + turfs, 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-08 23:52:11 +10:00
Cael_Aislinn 09a340235c fixed processing + tweaked heat generation and function of analysis machinery, fixed up floodlight, added suspension (stasis) field generator 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-08 23:50:46 +10:00
Cael_Aislinn 9b802ce142 added + fleshed out + tweaked some misc items and excavation tools, renamed file 2013-02-08 23:49:38 +10:00
Chinsky 2221162315 Fixed issue with newscaster channels not working with ' in them. 2013-02-07 21:48:40 +04:00
Chinsky 61a7634c6f Fixed typo in AttoUrney's job. 2013-02-07 21:47:56 +04:00
Chinsky 4dd238107b Added lung fixing and disease curing things to adminrevive. 2013-02-07 21:47:24 +04:00
Chinsky 4d7aa320cb Due to git tree being fucked up for some reason, manually reapplied many man many fixes. 
Just got to tip of real tree and got zipball, then unpacked it here.
 2013-02-07 07:13:27 +04:00
Chinsky 75341efb38 Missing PM link in msay. 2013-02-07 06:17:48 +04:00
Chinsky 08b9c538e0 readded missing tramadol reagent 2013-02-07 05:59:58 +04:00
Chinsky 0cce21ca87 Did it get reverted or something... witchery. 
Anyway, mods jumpy again.
 2013-02-07 05:54:27 +04:00
Chinsky 67a9028b9c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-02-07 05:48:48 +04:00
Chinsky f25ba15c2f removed debug print 2013-02-07 05:48:19 +04:00
Hawk-v3 1117db050d Merge pull request #2271 from comma/master 
Fixes Take Three
 2013-02-06 15:47:14 -08:00
Chinsky 4739184104 OH GEE LET'S LET EVERYONE AND THEIR ADMIN OBSERVER MOM USE THESE VERBS NOTHING CAN POSSIBLY GO WRONG. 
Slapped rights checks on verbs in VV menu.
 2013-02-07 03:40:01 +04:00
Chinsky 5801385443 Fix for alt titles not having access. 2013-02-07 02:37:35 +04:00
Chinsky 5fdd6462a1 Merge pull request #2265 from Gamerofthegame/bleeding-edge-freeze 
Map fixes
 2013-02-06 13:54:31 -08:00
Chinsky 058395a4ec Now washign hands will update sprite. 2013-02-06 22:01:24 +04:00
Chinsky 8396c9fb3f Fixed double definition of ethanol. 
Fixed issue with emotes being slurred up.
 2013-02-06 21:38:21 +04:00
Chinsky e02d79062f Fixed medical alt titles spawning naked, as much as I approve of Nurses doing it. 
Fixed ID having general rank instead of alt title.
Axed out some ambiguous alt titles, made capitalization more consistent in others.
 2013-02-06 20:30:31 +04:00
Chinsky 093fcfb721 Wizard: Hugbox Edition. 
Removed Ei Nath and mass gun spawn.
 2013-02-06 19:58:53 +04:00
Chinsky f114cdaf01 Fixed burn damage treated as brute one for organs. 2013-02-06 19:29:05 +04:00
Chinsky 1e44b47b83 No, monkeys do not have organs, stop lying. 2013-02-06 19:19:38 +04:00
Chinsky 8e958b11a2 Gave back rigs some fire protection. 
Removed double definition for metablism.
 2013-02-06 19:15:33 +04:00