cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 03:01:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,240 Commits 26 Branches 2 Tags
f883e06c2ea881dfd3d7e02d0e86ec3bdaa4fa00
Commit Graph

457 Commits

Author SHA1 Message Date
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
Tigercat2000
0a44d41005 Change max character slots to 20 2016-03-28 08:57:42 -07:00
Fox McCloud
3a9588b1e6 Merge pull request #3960 from Crazylemon64/various_appearance_fixes 
Appearance Refactor
 2016-03-23 11:22:32 -04:00
Crazylemon64
c641ab73f2 Fixes DNA and copy_to appearance, and some round-start IPC hair runtimes 2016-03-23 04:44:05 -07:00
Crazylemon64
cf6a5555f4 Fixes DNA name and mitocholide limb rejuv 2016-03-23 02:31:28 -07:00
Crazylemon64
b9242cc960 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into various_appearance_fixes 2016-03-21 22:39:45 -07:00
Crazylemon64
dbbbbac7a4 Moves most appearance code into "copy_to", rather than new_player 2016-03-21 22:26:41 -07:00
TheDZD
1212c9dde5 Merge pull request #3943 from KasparoVy/ipc-fbp-emergency-fix 
ASAP Fix, Character Configuration - Prosthetic Typo
 2016-03-20 19:14:28 -04:00
KasparoVy
5ffc070a4f FIX 2016-03-20 19:01:52 -04:00
TheDZD
854420bc74 Merge pull request #3911 from KasparoVy/ipc-fbp-resolved 
IPC-FBP Customization
 2016-03-20 18:43:51 -04:00
KasparoVy
760f956cf7 Drops some excess brackets. 2016-03-19 04:27:12 -04:00
Crazylemon64
d748ef23b8 Makes DNA swapping methods more reliable 
- Makes heads keep hair on removal
- Amputated limbs from a DNA-injected individual now will keep their
  appearance of the DNA-injected person
- Wounds will now vanish on their own now
- Admins now have an "incarnate" option on the player panel when viewing
  ghosts for quick player instantiation
- Fixes a runtime regarding failing a limb reconnection surgery
- Copying a client's preferences now overrides the previous mob's DNA
 2016-03-17 23:07:45 -07:00
KasparoVy
98285c0518 No longer, I hope. 2016-03-17 20:37:41 -04:00
TheDZD
d0ee1d2caa Merge pull request #3765 from tigercat2000/watchlist 
Change Watchlist to use send2adminirc instead of send2irc_adminless_only
 2016-03-06 12:58:33 -05:00
Tigercat2000
27c7810e04 Change Watchlist to use send2adminirc instead of send2irc_adminless_only 2016-03-05 11:44:26 -08:00
Fox McCloud
ab490f7fd9 Merge pull request #2903 from Aurorablade/OrganRefactor 
[HOLY SHIT!]Charlie, lets go to candy mountain, charlie
 2016-03-04 19:51:50 -05:00
Fox McCloud
b5df688605 Merge pull request #3744 from Crazylemon64/human_icons_tweak 
Changing a person's appearance now works better
 2016-03-03 20:38:18 -05:00
Crazylemon64
7e510dfdb6 Changing a person's appearance now works better 
Also fixes some problems on changing gender
 2016-02-29 19:31:29 -08:00
Crazylemon64
a816e0e0aa Makes buildmode quit if you switch to another mob, to prevent tragedy 2016-02-29 08:09:47 -08:00
Crazylemon64
a8f890bad1 Updates the buildmode tool to allow for better area generator testing 2016-02-29 07:09:00 -08:00
Tigercat2000
976887b2e0 Replace text2list and list2text 2016-02-28 12:07:19 -08:00
Tigercat2000
5294b4c223 510: Remove BYGEX completely, remove autoconvert notes 
notes (never used + uses bygex specific things)
 2016-02-28 11:21:30 -08:00
Aurorablade
5f98feb0bc meanwhile as i driver tiger INSANE 2016-02-25 16:17:39 -05:00
Aurorablade
9a804ebd31 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-24 06:27:16 -05:00
Tastyfish
41cee29623 Fixes jukebox actually using preferences (Volume and Head Streaming) 2016-02-24 00:22:37 -05:00
Aurorablade
b2881bdc94 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-26 21:17:25 -05:00
TheDZD
2e6b7c3c5b Enables control_freak 
Still allows for custom skins and macros. control_freak is disabled for admins.
 2016-01-24 14:51:54 -05:00
Aurorablade
95dca71432 Merge branch 'OrganRefactor' of https://github.com/Aurorablade/Paradise; branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-21 21:11:26 -05:00
Tigercat2000
48349a3d9e Nano Obssession: Chromeless window, Styles 
Does the following:
 - Adds 'chromeless' mode (NanoUI defaults to using this)
  - Window borders disappear, replaced by in-browser elements for
    minimize/close/move/resize.
  - You *must* move/resize slowly when using this mode, or it can have
    unexpected results, as the JavaScript cannot keep up as well as the
    native windows movement.
 - StatusGroups are now transparent: This looks nice. That's about it.
 - Body background switched to a .svg format for the NanoUI Logo.

 - Coder things:
  - Nano's JavaScript now has a new class, NanoWindow
   - NanoWindow handles all of the chromeless work. It'll be used to
     replace portions of NanoStateManager later.
 2016-01-18 09:54:40 -08:00
Aurorablade
51013b97c0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-15 08:10:24 -05:00
Crazylemon64
de13a4e4d3 Various Ragin' Mages fixes 
* Additionally, increases the number of memes in the codebase
 2016-01-13 21:56:56 -08:00
Tigercat2000
a615fec97f Update client topic debugging 2016-01-09 09:34:44 -08:00
TheDZD
34901c8664 Merge pull request #3125 from Fox-McCloud/typo-fixes 
Fixes a Few Vulp Typo's
 2016-01-05 20:20:37 -05:00
Fox-McCloud
9478fc078c Fixes a Few Vulp Typo's 2016-01-05 19:39:19 -05:00
Aurorablade
948adea83b Added Asses as an organ 
...made you look...
seriously though, refined some surgery datums/steps and commiting so i
can go bugfix some stuff...and a sidequest...i need to adjust return
values.
 2016-01-04 08:25:39 -05:00
Crazylemon
01fd2e0f7b Removes that conversion proc we didn't actually use 2016-01-03 21:43:59 -08:00
FalseIncarnate
a358291d83 EMERGENCY PASTE REMOVAL 
Copy-paste struck again!
 2016-01-04 00:00:50 -05:00
Fox McCloud
103372e92b Merge pull request #3037 from KasparoVy/master 
Adds Body Marking Customization, Head Accessories, Revises Unathi Customization, Related Minor Fixes, etc.
 2016-01-03 22:33:40 -05:00
Tigercat2000
0971ef903b NanoUI Improvements Part 2: SEE ESS ESS 2016-01-01 12:51:08 -08:00
KasparoVy
eb47c80d75 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' 2015-12-30 18:16:17 -05:00
Fox McCloud
e67450d56d Merge pull request #3025 from Crazylemon64/infinite_antags 
Infinite antag tags
 2015-12-30 13:52:41 -05:00
KasparoVy
a1d0e5a0df Keeping Up-to-date with 3025 2015-12-29 19:36:14 -05:00
Crazylemon
e576b3a777 Fixes Fox's points 2015-12-29 10:18:56 -08:00
KasparoVy
5d816d943d Cleans up the tiniest bit. 2015-12-28 20:57:07 -05:00
KasparoVy
f0c4a0623c Final Accommodation of #3025 
Copypastas #3025's version of code\modules\client\preferences.dm and
re-applies all the changes I made to the pre-#3025 version of that file
in order to accommodate the PR.
 2015-12-28 20:43:58 -05:00
KasparoVy
78d3045eca Accommodates #3025 2015-12-28 19:55:49 -05:00
Crazylemon64
e5bcd0d39f Format update now also autosaves the new antag prefs 2015-12-28 01:15:22 -08:00
Crazylemon64
c4cb53bf0a To heck with it here we go looks good enough 
Also
- Increases the number of memes in the codebase
 2015-12-28 01:12:13 -08:00